Merge branch 'bd-test' of 47.94.45.65:angelo/web-base-h5 into bd-online

components/withdrawalGuide/index.vue

@@ -14,48 +14,56 @@
       <view class="guide-text">
         <text>尊敬的经销商伙伴们：</text>
         <text
-          >为了让大家顺利快捷地提现，符合法律法规的要求，现需完成提现绑定操作，步骤如下，按序操作即可：</text
+          >为保障大家能够顺利、快捷地进行提现操作，同时积极响应并符合十一后国家法律法规的最新要求，现需各位经销商伙伴完成提现绑定操作。以下是详细的操作步骤，请大家按照顺序依次进行：</text
         >
       </view>
       <view class="guide-steps">
         <view class="step-item">
           <text class="step-number">1.</text>
           <text class="step-text"
-            >微信扫码后，用实际收款人本人手机号登录；</text
+            >扫码进入签约页面：使用微信扫描指定二维码，进入相关操作界面后，点击“去签约”。</text
           >
         </view>
         <view class="step-item">
           <text class="step-number">2.</text>
           <text class="step-text"
-            >点击 "继续签约"，上传本人身份证照片完成实名认证；</text
+            >在线签约：在跳转的页面中，找到并点击“在线签约”选项。同意隐私政策：仔细阅读隐私政策申明，确认无误后，点击“同意并继续”。</text
           >
         </view>
         <view class="step-item">
           <text class="step-number">3.</text>
           <text class="step-text"
-            >进入合同页面，选择 "默认印章"，输入收到的验证码完成签约；</text
+            >绑定手机号码：输入绑卡人的手机号码，获取验证码，将收到的验证码准确输入后，点击“下一步”。</text
           >
         </view>
         <view class="step-item">
           <text class="step-number">4.</text>
           <text class="step-text"
-            >返回首页点击 "提现"（若显示 "开户"，下拉刷新页面即可）；</text
+            >上传身份证照片：可选择现场拍摄身份证正反面照片，或从手机相册中选取已保存的身份证正反面照片进行上传，上传完成后点击“下一步”。</text
           >
         </view>
         <view class="step-item">
           <text class="step-number">5.</text>
           <text class="step-text"
-            >进入绑卡页面，完成银行卡绑定后即可操作提现。</text
+            >输入银行卡号：准确输入银行卡号，系统将提示“签约成功”，随后自动跳转到协议页面。</text
+          >
+        </view>
+        <view class="step-item">
+          <text class="step-number">6.</text>
+          <text class="step-text"
+            >完成手写签名：在协议页面的最下方，进行手写签名操作，签名完成后即完成整个签约流程。</text
           >
         </view>
       </view>
       <view class="guide-footer">
-        <text>请大家尽快办理，有疑问可随时联系我们，感谢配合！</text>
+        <text
+          >请大家务必尽快办理提现绑定操作，以免影响后续的提现业务。若在操作过程中遇到任何疑问或困难，可随时与我们联系，我们将竭诚为大家提供帮助。感谢大家的理解与配合！</text
+        >
       </view>
       <view class="qr-code-section">
         <image
           class="qr-code-image"
-          src="https://bd-qd.oss-cn-beijing.aliyuncs.com/online_tmp/appletCode.png"
+          src="@/static/images/qr-code.png"
           mode="aspectFit"
         />
       </view>
@@ -82,8 +90,9 @@ export default {
 
 <style lang="scss" scoped>
 .withdrawal-guide-content {
-  padding: 0rpx 32rpx 32rpx;
+  padding: 0rpx 20rpx 20rpx;
-
+  height: 80vh;
+  overflow-y: auto;
   .guide-title {
     font-size: 32rpx;
     font-weight: bold;

manifest.json

@@ -45,11 +45,7 @@
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ],
-                "abiFilters": [
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
-                    "armeabi-v7a",
-                    "arm64-v8a",
-                    "x86"
-                ]
             },
             /* ios打包配置 */
             "ios" : {
@@ -104,6 +100,11 @@
                     }
                 }
             }
+        },
+        "optimization" : {
+            "treeShaking" : {
+                "enable" : true
+            }
         }
     },
     "fallbackLocale" : "zh-Hans"

pages/index/index.vue

@@ -1,9 +1,9 @@
 <template>
-  <view :class="userInfo.skin ? 'content1' : 'content'">
+  <view class="content">
     <view class="content_a">
       <!-- 商品专区入口 先别删  -->
       <!-- <view @tap="goSpecialArea">会员专区</view> -->
-      <view :class="userInfo.skin ? 'index-top1' : 'index-top'"> </view>
+      <view class="index-top"> </view>
 
       <view class="banner" v-if="isEmpty(goodsList.advertBannerList) == false">
         <view class="uni-margin-wrap">
@@ -60,14 +60,7 @@
           ref="child"
           :publishLocationIndex="10"
         ></notice-popup>
-        <!-- 植树弹窗
+
-        <getTree ref="tree"></getTree>
-         -->
-        <!-- 站内信弹窗 -->
-        <znNewsPopup
-          ref="child2"
-          @childMethodTrigger="callChildMethod"
-        ></znNewsPopup>
         <!-- 直推排行弹窗 -->
         <RankingPopup
           ref="rankingPopup"
@@ -104,8 +97,6 @@ import * as ban from '@/config/balance.js'
 import { getAreaGoods } from '@/config/special-area'
 import clTabbar from '@/components/cl-tabbar.vue'
 import noticePopup from '@/components/noticePopup.vue'
-import getTree from '@/components/getTree.vue'
-import znNewsPopup from '@/components/znNewsPopup.vue'
 import areaProductList from '@/components/area-product-list/index.vue'
 import { formatCurrency } from '@/util/index.js'
 import { mapGetters } from 'vuex'
@@ -116,9 +107,7 @@ import RankingPopup from '@/components/RankingPopup.vue'
 export default {
   components: {
     noticePopup,
-    znNewsPopup,
     'cl-tabbar': RaisedTabbar,
-    getTree,
     areaProductList,
     RegionSelect,
     GoodsList,
@@ -490,9 +479,6 @@ export default {
         }
       })
     },
-    callznMethod() {
-      this.$refs.child2.getUserTc2()
-    },
     noticePopupHandleClose() {
       // this.$refs.regionSelect.getRegionSelect()
     },
@@ -686,15 +672,15 @@ export default {
     }
   }
 }
-.content1 {
+// .content1 {
-  background: url('~@/static/images/fBgd.jpg') no-repeat;
+//   background: url('~@/static/images/fBgd.jpg') no-repeat;
-  background-size: 100% 100%;
+//   background-size: 100% 100%;
-  height: 100vh;
+//   height: 100vh;
-  .content_a {
+//   .content_a {
-    overflow: auto;
+//     overflow: auto;
-    height: 100%;
+//     height: 100%;
-  }
+//   }
-}
+// }
 .more {
   color: #333;
   background-color: #fff;
@@ -992,21 +978,6 @@ page {
     padding: 30rpx 20rpx;
   }
 }
-.index-top1 {
-  background: url('~@/static/images/tBgd.jpg') no-repeat;
-  background-size: 100% 100%;
-  // padding: 30rpx 20rpx; // height: 100rpx;
-  // background-color: #fff;
-  display: flex;
-  justify-content: space-between;
-  position: fixed;
-  z-index: 10;
-  width: 100%;
-  height: 100%;
-  .index_t {
-    padding: 30rpx 20rpx;
-  }
-}
 
 .index-right {
   display: flex;

pages/mine/balance/index.vue

@@ -139,10 +139,11 @@ export default {
     }
     this.topList[0].path =
       '/pages/pay/index?paramsPost=' + JSON.stringify(params)
-    this.getList()
+
     this.userInfo = uni.getStorageSync('User')
   },
   onShow() {
+    this.getList()
     this.gettopList()
     this.ifCodeName()
   },

pages/mine/balance/withdrawal.vue

@@ -7,7 +7,7 @@
         :rules="rules"
         ref="uForm"
       >
-        <u-form-item
+        <!-- <u-form-item
           label-width="200rpx"
           :label="'银行卡号'"
           prop="cardNumber"
@@ -24,7 +24,7 @@
           <view v-else style="color: red" @click="goBindbank">
             {{ '请先绑定银行卡' }}
           </view>
-        </u-form-item>
+        </u-form-item> -->
         <u-form-item
           label-width="200rpx"
           :label="`${'提现金额'}(${isLocaled()})`"
@@ -134,7 +134,7 @@
       <u-button class="subbtn" @click="submit">{{ '提现' }}</u-button>
     </view>
     <u-toast ref="uToast"></u-toast>
-    <u-modal
+    <!-- <u-modal
       :show="unBindDefaultModal"
       showCancelButton
       @cancel="unBindDefaultModal = false"
@@ -143,12 +143,12 @@
       @confirm="unBindDefaultConfirm"
     >
       请先绑定默认银行卡
-    </u-modal>
+    </u-modal> -->
     <!-- 提现引导弹窗 -->
-    <!-- <WithdrawalGuide
+    <WithdrawalGuide
       :show="showWithdrawalGuide"
       @confirm="onWithdrawalGuideConfirm"
-    /> -->
+    />
   </view>
 </template>
 
@@ -242,14 +242,14 @@ export default {
             this.dataForm.pkAccount = res.data[0].pkId
           }
         })
-      bal.getDefaultBank().then(res => {
+      // bal.getDefaultBank().then(res => {
-        if (res.data && Object.keys(res.data).length > 0) {
+      //   if (res.data && Object.keys(res.data).length > 0) {
-          this.bankData = res.data
+      //     this.bankData = res.data
-          this.dataForm.pkBank = res.data.pkId
+      //     this.dataForm.pkBank = res.data.pkId
-        } else {
+      //   } else {
-          this.unBindDefaultModal = true
+      //     this.unBindDefaultModal = true
-        }
+      //   }
-      })
+      // })
     },
     unBindDefaultConfirm() {
       this.unBindDefaultModal = false
@@ -267,14 +267,14 @@ export default {
                 message: res.msg || '提现成功',
                 type: 'success',
               })
-              setTimeout(() => {
+              // setTimeout(() => {
-                uni.navigateBack()
+              //   uni.navigateBack()
-              }, 500)
+              // }, 500)
 
               // 显示提现引导弹窗
-              // setTimeout(() => {
+              setTimeout(() => {
-              //   this.showWithdrawalGuide = true
+                this.showWithdrawalGuide = true
-              // }, 300)
+              }, 300)
             }
           })
         })
@@ -292,9 +292,6 @@ export default {
       if (!this.dataForm.cashAmount) {
         uni.$u.toast('请先输入金额')
         return
-      } else if (!this.dataForm.pkAccount) {
-        uni.$u.toast('请先选择账户')
-        return
       }
       bal
         .getWidthdrawShow({