add 兼容扫码问题

xuxueyang

2024-09-05 f8867b8df117d1ac0f1311970994e15059c3da03

 pages/login/supplier-login.vue

@@ -1,5 +1,5 @@
<template>

   <view class="main-container login-container img100 relative" style="margin-top: 0rpx;">

   <view class="main-container login-container img100 relative" style="margin-top: 0rpx;min-height: 100vh;">

      <!-- background-image:url('@/static/images/supplier/login/bg.png') -->



      <image class="component-bg"

@@ -45,6 +45,43 @@
                  <u-input placeholder="请输入手机验证码" :border="false" v-model="smsCode"></u-input>



               </view>



               <view class="flex flex-wrap-normal" v-if="true">

                  <view :style="{'margin-top': '24rpx','margin-right': '12rpx','font-size':'24rpx'}"

                     @click="protocal=!protocal" class="component-radio" :class="[protocal?'cur':'']">



                  </view>

                  <!-- /pages/help/content?id=新手帮助 -->

                  <!-- 用户协议，隐私政策、卖家入驻协议、合伙人入驻协议 -->



                  <!-- #ifdef PUB_PARTNER -->

                  <view class="topic-gray">

                     请仔细阅读<span class="t-red" @click="goto('/pages/help/content?id=用户协议',false)">《用户协议》</span>、

                     <span class="t-red" @click="goto('/pages/help/content?id=隐私政策',false)">《隐私政策》</span>

                     、<span class="t-red" @click="goto('/pages/help/content?id=合伙人入驻协议',false)">《合伙人入驻协议》</span>

                     如您同意该指引，请勾选开始使用本小程序

                  </view>

                  <!-- #endif -->

                  <!-- #ifdef PUB_SUPPLIER -->

                  <view class="topic-gray">

                     请仔细阅读<span class="t-red" @click="goto('/pages/help/content?id=用户协议',false)">《用户协议》</span>、

                     <span class="t-red" @click="goto('/pages/help/content?id=隐私政策',false)">《隐私政策》</span>

                     、<span class="t-red" @click="goto('/pages/help/content?id=卖家入驻协议',false)">《卖家入驻协议》</span>

                     如您同意该指引，请勾选开始使用本小程序

                  </view>

                  <!-- #endif -->

                  <!-- #ifdef PUB_CUSTOMER -->

                  <view class="topic-gray">

                     请仔细阅读<span class="t-red" @click="goto('/pages/help/content?id=用户协议',false)">《用户协议》</span>和

                     <span class="t-red" @click="goto('/pages/help/content?id=隐私政策',false)">《隐私政策》</span>

                     如您同意该指引，请勾选开始使用本小程序

                  </view>

                  <!-- #endif -->



               </view>











               <button @tap="login()" class="bottom-button">登 录</button>

@@ -105,9 +142,9 @@
         }

         try {

            if (!querydto.partnerUserId) {

               if (options.query && options.query.scene) {

               if (options.query && options.query.scene || options.scene) {

                  //说明是特殊小程序二维码扫码跳转的

                  var keyvalues = decodeURIComponent(options.query.scene).split("&")

                  var keyvalues = decodeURIComponent(options.query&&options.query.scene || options.scene).split("&")

                  for (var item of keyvalues) {

                     var tarr = item.split("=")

                     querydto[tarr[0]] = tarr[1]

@@ -308,7 +345,8 @@
      },

      onShareAppMessage() {

         let that = this;

         var name = that.currentInfo.customerDTO&&that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO&&that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO&&that.currentInfo.partnerDTO.name || ''
         var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&

            that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''

         var url =

            `/pages/login/supplier-login?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数

         return {

@@ -318,7 +356,8 @@
      },

      onShareTimeline() {

         let that = this;

         var name = that.currentInfo.customerDTO&&that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO&&that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO&&that.currentInfo.partnerDTO.name || ''
         var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&

            that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''

         var url =

            `/pages/login/supplier-login?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数

         return {

@@ -346,7 +385,8 @@
            getCodeText: '获取验证码',

            getCodeBtnColor: "#20613D",

            getCodeisWaiting: false,

            Timer: undefined,

            Timer: undefined,
            protocal:false,

            // #ifdef PUB_SUPPLIER

            apitype: 'loginSupplier',

            // #endif

@@ -459,7 +499,11 @@
         changeAll(e) {

            this.pcfvalue = e.detail.value[0]

         },

         async login() {

         async login() {
            if(!this.protocal){
               this.$message.showToast('请同意用户协议')
               return
            }

            uni.showLoading({

               title: '登陆中'

            });

@@ -525,7 +569,7 @@
               //    uni.navigateBack();

               // }, 1000);



					




            } else {

               // uni.showToast({