jufubao-base 1.0.146 → 1.0.148-beta1

package/src/components/JfbBasePay/JfbBasePay.vue

@@ -100,10 +100,7 @@
       <view class="remain_pay" v-if="payInfo.channel_amount > 0">
         <view style="border-bottom: 2rpx solid #eee;" class="column-group">
           <view class="column-item" style="padding: 30rpx 60rpx">
-            <view class="column_label">
-              仍需支付
-              <view class="label_sub">（可使用多张票券支付）</view>
-            </view>
+            <view class="column_label">仍需支付<text class="label_sub">（可使用多张票券支付）</text></view>
             <view class="column_value text-primary">
               <xd-unit
                 :price="payInfo.channel_amount"
@@ -135,31 +132,25 @@
             class="pay_item"
           >
             <view class="icon">
-              <xd-font-icon
-                v-if="item.channel_code == 'wxpay'"
-                icon="iconwx"
-                size="64"
-                color="#25bc46"
-              ></xd-font-icon>
+              <image mode="scaleToFill" :src="item['channel_logo']" style="height:64rpx; width: 64rpx" />
             </view>
             <view class="pay_name">{{ item.channel_provider_name }}</view>
             <xd-radio
               @change="(flat) => handlerPayCheck(item.channel_provider_id, flat)"
-              :value="channel_provider_id == item.channel_provider_id"
+              :value="channel_provider_id === item.channel_provider_id"
               size="mini"
             ></xd-radio>
           </view>
         </view>
       </view>
       <view class="bottom_btn-mask"></view>
-      <view v-if="is_can_pay=='Y'" class="bottom_btn" :style="prod_bottom">
+      <view v-if="is_can_pay==='Y'" class="bottom_btn" :style="prod_bottom">
         <xd-button
           width="360rpx"
           type="primary"
           radius="50rpx"
           @click="doThirdPay"
-          >确认支付</xd-button
-        >
+        >确认支付</xd-button>
       </view>
     </view>
   </view>
@@ -336,7 +327,6 @@ export default {
           item["end_time"] = this.getTimeFormat(item.end_time);
           return item;
         });
-        //this.cardList = [...this.cardList,...this.cardList,...this.cardList,...this.cardList,...this.cardList]
       });
     },
     p_getListUserPayChannel() {
@@ -590,7 +580,7 @@ export default {
       .remain_header {
         display: flex;
         justify-content: space-between;
-        padding: 16rpx 60rpx 0;
+        padding: 30rpx 60rpx 0;
         color: #999999;
         font-size: 24rpx;
       }
@@ -607,8 +597,8 @@ export default {
           width: 64rpx;
           height: 64rpx;
           border-radius: 32rpx;
-          // background: #DDD;
           margin-right: 30rpx;
+          overflow: hidden;
         }
         .pay_name {
           flex: 1;

package/src/components/JfbBasePosterType/JfbBasePosterType.vue

@@ -23,7 +23,7 @@
           borderRadius: bgRadius + 'rpx'
         }"
       >
-        <four-screen :config="getConfig" :content="info"></four-screen>
+        <four-screen style="width: 100%;" :config="getConfig" :content="info"></four-screen>
       </view>
 
     </view>

package/src/components/JfbBaseSearch/JfbBaseSearch.vue

@@ -17,16 +17,24 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-search__body" :style="{height:layoutInfo.bodyMinHeightRpx+'rpx'}" v-if="layoutInfo!==null">
+      <!--#ifdef H5-->
       <xd-baidu-search
         @onSelect="handleSelect"
       ></xd-baidu-search>
+      <!-- #endif -->
+
+      <!-- #ifdef MP-WEIXIN -->
+      base Search
+      <!-- #endif -->
     </view>
   </view>
 </template>
 
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  // #ifdef H5
   import XdBaiduSearch from "./XdBaiduSearch";
+  // #endif
   import {jfbRootExec} from "@/utils/xd.event";
   import JfbBaseSearchMixin from "./JfbBaseSearchMixin";
   import componentsMixins from "@/mixins/componentsMixins";
@@ -37,7 +45,9 @@
     name: "JfbBaseSearch",
     components: {
       XdFontIcon,
-      XdBaiduSearch
+      // #ifdef H5
+      XdBaiduSearch,
+      // #endif
     },
     mixins: [componentsMixins,extsMixins,JfbBaseSearchMixin],
     data() {

package/src/components/JfbBaseWxAuthorize/Api.js

@@ -18,6 +18,19 @@ module.exports = [
     isConsole: true,
     disable: true,
   },
+  {
+    mapFnName: 'userPhoneCollect',
+    title: "收集手机号",
+    path: "/passport/v1/user/collect-phone-number",
+    isRule: false,
+    data: {
+      phone_number: ['手机号', 'String', null], //手机号
+      verification_code: ['手机验证码', 'String', null],
+      provider_id: ['登录方式id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disable: true,
+  },
   {
     mapFnName: "getContentInfo",
     title: "获取内容列表",

package/src/components/JfbBaseWxAuthorize/Attr.js

@@ -19,6 +19,26 @@ export default {
         placeholder: '请选择文字颜色',
         classNmae: 'input80',
       },
+      {
+        abel: '授权收集手机号按钮文案:',
+        ele: 'el-input',
+        type: 'text',
+        valueKey: 'btnCollectPhoneText',
+        groupKey:'content',
+        value: data.btnCollectPhoneText || "授权手机号",
+        placeholder: '请输入授权收集手机号按钮文案',
+        className: 'input80',
+      },
+      {
+        abel: '授权登录按钮文案:',
+        ele: 'el-input',
+        type: 'text',
+        valueKey: 'btnLoginText',
+        groupKey:'content',
+        value: data.btnLoginText || "微信授权登录",
+        placeholder: '请输入授权按钮文案',
+        className: 'input80',
+      },
       {
         label: '授权按钮下面文案:',
         ele: 'el-input',

package/src/components/JfbBaseWxAuthorize/JfbBaseWxAuthorize.vue

@@ -24,6 +24,7 @@
           }"
         >
         </view>
+        <view v-if="!auth_code" class="app-body__jump" @click="doJump">跳过</view>
         <view class="app-body__bottom">
           <view class="app-body__bottom-btn">
             <button
@@ -35,7 +36,7 @@
                 boxShadow: '0 5rpx 10rpx ' + mainColor
               }"
               @getphonenumber="decryptPhoneNumber"
-            >微信授权登录</button>
+            >{{ authBtnText }}</button>
             <button
               v-else
               @click="decryptPhoneNumber()"
@@ -43,7 +44,7 @@
                 background: mainColor,
                 boxShadow: '0 5rpx 10rpx ' + mainColor
               }"
-            >微信授权登录</button>
+            >{{ authBtnText }}</button>
           </view>
           <view class="app-body__bottom-tips" v-if="notice" v-html="notice" :style="{color: textColor}"></view>
           <view class="app-body__bottom-policy">
@@ -87,7 +88,7 @@
       return {
         isPreview: false,
         selectPolicy: false,
-        auth_code: null,
+        auth_code: null,  //有值说明未关联
         provider_id:null,
         nextUrl: null,
         showDialog: false,
@@ -98,11 +99,16 @@
         //面板
         bgImage: '', //背景图片
         notice: '', //授权按钮下面文案
-        textColor: '#fff'
+        textColor: '#fff',
+        btnLoginText: "",  //授权按钮文案
+        btnCollectPhoneText: "",  //授权收集手机号按钮文案
       }
     },
     computed:{
       ...mapState(['jfbAuthorize']),
+      authBtnText(){
+        return this.auth_code ? this.btnLoginText : this.btnCollectPhoneText;
+      }
     },
     watch: {
       container(value) {
@@ -127,6 +133,14 @@
         this.selectPolicy = !this.selectPolicy;
       },
 
+      doJump(){
+        if(!this.auth_code){
+          this.$xdUniHelper.redirectTo({
+            url: this.nextUrl
+          })
+        }
+      },
+
       decryptPhoneNumber(e) {
         if (e === undefined) {
           this.$xdConfirm({
@@ -146,6 +160,18 @@
         let {iv, encryptedData} = e.detail;
         let raw_data = JSON.stringify({iv, encryptedData});
 
+        //auth_code 临时授权码，走授权登录。 否则走授权收集手机号
+        if(this.auth_code){
+          this.p_userPhoneWxLogin(raw_data)
+        }else{
+          this.p_userPhoneCollect(raw_data)
+        }
+      },
+
+      /**
+       * @description 授权登录
+       */
+      p_userPhoneWxLogin(raw_data){
         jfbRootExec("userPhoneWxLogin", {
           vm: this,
           data: {
@@ -183,9 +209,30 @@
             zIndex: this.isPreview ? 2000 : 1400
           });
         })
-
       },
 
+      /**
+       * @description 授权收集手机号
+       */
+      p_userPhoneCollect(raw_data){
+        uni.login({
+          provider: "weixin",
+          success: (loginRes) => {
+            jfbRootExec("userPhoneCollect", {
+              vm: this,
+              data: {
+                raw_data,
+                third_auth_code: loginRes.code,
+                provider_id: this.provider_id,
+              }
+            }).then(res => {
+              this.$xdUniHelper.redirectTo({
+                url: this.nextUrl
+              })
+            })
+          }
+        })
+      },
 
       /**
        * @description 监听事件变化
@@ -195,6 +242,8 @@
         let bgImage = getContainerPropsValue(container, 'content.bgImage', {});
         if(bgImage.url) this.bgImage = getServiceUrl(bgImage.url);
         this.notice = getContainerPropsValue(container, 'content.notice', '');
+        this.btnLoginText = getContainerPropsValue(container, 'content.btnLoginText', '微信授权登录');
+        this.btnCollectPhoneText = getContainerPropsValue(container, 'content.btnCollectPhoneText', '获取手机号');
         this.textColor = getContainerPropsValue(container, 'content.textColor', '#fff');
       },
 
@@ -242,6 +291,12 @@
 
     }
 
+    &__jump {
+      position: absolute;
+      top: 40rpx;
+      right: 40rpx;
+    }
+
     &__bottom {
       position: absolute;
       bottom: unit(80, rpx);