From e7295879bccc07290c452c36300378526d046ef8 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Sat, 2 Dec 2023 17:21:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/new_diy/button.vue             | 70 ++++++++++---------
 src/router/index.js                           |  4 +-
 .../member_income_withdrawal_controller.js    | 16 ++---
 .../income/member_income_withdrawal_v2.vue    |  2 +-
 .../member/weight_value/legumes/shopping.vue  | 67 +++++++++++++++++-
 vue.config.js                                 |  2 +-
 6 files changed, 112 insertions(+), 49 deletions(-)

diff --git a/src/components/new_diy/button.vue b/src/components/new_diy/button.vue
index e08a6d6..a721e60 100644
--- a/src/components/new_diy/button.vue
+++ b/src/components/new_diy/button.vue
@@ -1,45 +1,46 @@
 <template>
   <div class="U000004-template1" :class="className">
-    <!-- style -->
-    <div v-html="css"></div>
-    <!--标题-->
-    <div class="button-group-title" v-if="datas.title">{{ datas.title }}</div>
-    <!-- 列表 -->
-    <div v-if="datas.list.length <= 0" style="text-align: center; font-size: 16px; line-height: 32px;">
-      请先添加按钮
-    </div>
-    <ul class="button-box" v-if="datas.list.length > 0 && !datas.is_scroll">
-      <li v-for="(item, index) in datas.list" :key="`${index}-${item.id}`">
-        <div @click.stop="toUrl(item)">
-          <img class="button-img" :src="item.image || emptyImage" alt="">
-          <p class="button-title">{{ item.text }}</p>
-          <p class="button-desc" v-if="item.desc">{{ item.desc }}</p>
-        </div>
-        <div style="text-align: center; width: 100%; position: absolute; height: 100%;" v-if="item.is_minApp == 2 && (!fun.isApp() || !fun.isCPS())" v-html="item.html">
-        </div>
-      </li>
-    </ul>
-    <swiper style="width: 100%;"
-            v-if="datas.list.length > 0 && datas.is_scroll"
-            :options="swiperOption"
-            ref="mySwiper">
-      <!-- slides -->
-      <swiper-slide v-for="(items, idx) in scroll_list" :key="idx" class="button-box">
-        <li v-for="(item, index) in items" :key="`${index}-${item.id}`">
+    <div class="U000004-template1-content">
+      <!-- style -->
+      <div v-html="css"></div>
+      <!--标题-->
+      <div class="button-group-title" v-if="datas.title">{{ datas.title }}</div>
+      <!-- 列表 -->
+      <div v-if="datas.list.length <= 0" style="text-align: center; font-size: 16px; line-height: 32px;">
+        请先添加按钮
+      </div>
+      <ul class="button-box" v-if="datas.list.length > 0 && !datas.is_scroll">
+        <li v-for="(item, index) in datas.list" :key="`${index}-${item.id}`">
           <div @click.stop="toUrl(item)">
             <img class="button-img" :src="item.image || emptyImage" alt="">
             <p class="button-title">{{ item.text }}</p>
             <p class="button-desc" v-if="item.desc">{{ item.desc }}</p>
           </div>
-
-          <div style="text-align: center; position: absolute; height: 100%;" v-if="item.is_minApp == 2 && (!fun.isApp() || !fun.isCPS())" v-html="item.html">
+          <div style="text-align: center; width: 100%; position: absolute; height: 100%;" v-if="item.is_minApp == 2 && (!fun.isApp() || !fun.isCPS())" v-html="item.html">
           </div>
         </li>
-      </swiper-slide>
-      <!--分页-->
-      <div class="swiper-pagination" slot="pagination"></div>
-    </swiper>
+      </ul>
+      <swiper style="width: 100%;"
+              v-if="datas.list.length > 0 && datas.is_scroll"
+              :options="swiperOption"
+              ref="mySwiper">
+        <!-- slides -->
+        <swiper-slide v-for="(items, idx) in scroll_list" :key="idx" class="button-box">
+          <li v-for="(item, index) in items" :key="`${index}-${item.id}`">
+            <div @click.stop="toUrl(item)">
+              <img class="button-img" :src="item.image || emptyImage" alt="">
+              <p class="button-title">{{ item.text }}</p>
+              <p class="button-desc" v-if="item.desc">{{ item.desc }}</p>
+            </div>
 
+            <div style="text-align: center; position: absolute; height: 100%;" v-if="item.is_minApp == 2 && (!fun.isApp() || !fun.isCPS())" v-html="item.html">
+            </div>
+          </li>
+        </swiper-slide>
+        <!--分页-->
+        <div class="swiper-pagination" slot="pagination"></div>
+      </swiper>
+    </div>
     <!-- 海报 -->
     <yz-goodsposter v-model="posterShow" :posterData="poster_Data" :defaultImg="poster" :width="`18.875rem`" v-on:finish="uploadImageM"></yz-goodsposter>
     <!-- 海报 end -->
@@ -70,8 +71,9 @@ const css = function () {
   } = this.datas;
 
   return `
-  .U000004-template1{
-  padding: 10px 0 0px 0;
+  .component-${this.id}{
+      width: 100%;
+ padding: ${padding_top}px 0 ${padding_bottom}px 0!important;
   flex-direction: column;
             background-color: ${preview_color.color || '#f8f8f8'};
             background-image: url(${preview_color.isColor == 2? preview_color.image: ''});
diff --git a/src/router/index.js b/src/router/index.js
index 3b33f96..d6824b3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2364,7 +2364,7 @@ const routes = [
     component: Withdrawal,
     name: "withdrawal",
     meta: {
-      title: "收入提现",
+      title: "推广提现",
       foot: true
     }
   },
@@ -2839,7 +2839,7 @@ const routes = [
     component: Love_cash,
     name: "love_cash",
     meta: {
-      title: "收入提现奖励详情",
+      title: "推广提现奖励详情",
       foot: true
     }
   },
diff --git a/src/views/member/income/member_income_withdrawal_controller.js b/src/views/member/income/member_income_withdrawal_controller.js
index 80df27a..a50682f 100644
--- a/src/views/member/income/member_income_withdrawal_controller.js
+++ b/src/views/member/income/member_income_withdrawal_controller.js
@@ -135,14 +135,14 @@ export default {
           name: `${this.fun.initWithdrawal()}记录`,
           url: "presentationRecord"
         },
-        {
-          name: `${this.fun.initWithdrawal()}规则说明`,
-          url: "fa_child"
-        },
-        {
-          name: "联系客服",
-          url: "fa_child_two"
-        }
+        // {
+        //   name: `${this.fun.initWithdrawal()}规则说明`,
+        //   url: "fa_child"
+        // },
+        // {
+        //   name: "联系客服",
+        //   url: "fa_child_two"
+        // }
       ],
       manualList:[],
       // 填写银行卡信息弹窗
diff --git a/src/views/member/income/member_income_withdrawal_v2.vue b/src/views/member/income/member_income_withdrawal_v2.vue
index c2db97b..5811e67 100644
--- a/src/views/member/income/member_income_withdrawal_v2.vue
+++ b/src/views/member/income/member_income_withdrawal_v2.vue
@@ -4,7 +4,7 @@
       :hide="false"
       :text="`${income_name_text}${fun.initWithdrawal()}`"
       tolink="presentationRecord"
-      :totext="`${fun.initWithdrawal()}记录/说明`"
+      :totext="`${fun.initWithdrawal()}记录`"
       :setQuery="{ extension: 'extension' }"
       :showToast="true"
       :toastTxt="toastTxt"
diff --git a/src/views/member/weight_value/legumes/shopping.vue b/src/views/member/weight_value/legumes/shopping.vue
index ee30aaa..32dff5e 100644
--- a/src/views/member/weight_value/legumes/shopping.vue
+++ b/src/views/member/weight_value/legumes/shopping.vue
@@ -103,7 +103,7 @@
     <!--视频弹框-->
     <van-popup v-model="is_video_show" position="center" :style="{ width: '100%',height: '100%' }" class="task-video-popup" :close-on-click-overlay="false">
       <div class="task-video-content">
-        <video id="taskMedia" @canplay="getVidDur()" :src="task_video_link" :loop="false" width="100vw" height="100vh">
+        <video id="taskMedia" :show-center-play-btn="false" @canplay="getVidDur()" :src="task_video_link" :loop="false" width="100vw" height="100vh">
           浏览器不支持播放视频
         </video>
       </div>
@@ -258,7 +258,7 @@ export default {
       isLoadMore: true,
     };
   },
-  mounted() {
+  activated() {
     let _this = this;
     // 获取基本信息
     _this.getData();
@@ -339,6 +339,7 @@ export default {
       let _this = this;
       let videoTime = document.getElementById('taskMedia');
       _this.videoTime = videoTime;
+      _this.videoTime.controls = false;
       _this.videoTime.play();
       // 监听视频暂停
       videoTime.addEventListener("pause", function () {
@@ -389,6 +390,7 @@ export default {
           let videoTime = document.getElementById('taskMedia');
           videoTime.currentTime = 0;
           videoTime.play();
+          videoTime.controls = false;
         },300); // 定时时间
       } else {
         // 微信分享
@@ -455,6 +457,7 @@ export default {
           if (response.result === 1) {
             let res = response.data;
             _this.staff = Object.values(res).length > 0 ? res : defaultStaff;
+            let status = _this.staff.status || 1;
             _this.third_party_show = is_show;
             // 处理时间
             if (res.account_id_start) {
@@ -465,6 +468,12 @@ export default {
               _this.selectedTime = new Date(year, month, day).getTime();
             }
             _this.$forceUpdate();
+            // 是否需要签约
+            if(status == 2){
+              _this.$dialog.alert({ message:'开户成功,立即签约！' }).then(()=>{
+                _this.goToSigning();
+              });
+            }
           }
         })
         .catch(error => {
@@ -521,7 +530,7 @@ export default {
           if (response.result === 1) {
             _this.$dialog.alert({ message:'提交成功，审核开户中...！' }).then(()=>{
               _this.getAccountInfo();
-              _this.thirdPartyBankCardInfo();
+              _this.thirdPartyBankCardInfo(false);
             });
           }else{
             _this.$dialog.alert({ message: response.msg }).then(()=>{
@@ -562,6 +571,54 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+video::-webkit-media-controls-panel {
+  display: none !important;
+  -webkit-appearance: none !important;
+}
+video::-webkit-media-controls-mute-button {
+  display: none !important;
+  -webkit-appearance: none !important;
+}
+video::-webkit-media-controls-play-button {
+  display: none !important;
+  -webkit-appearance: none !important;
+}
+video::-webkit-media-controls-current-time-display {
+  display: none !important;
+  -webkit-appearance: none !important;
+}
+video::-webkit-media-controls-time-remaining-display {
+  display: none !important;
+  -webkit-appearance: none !important;
+}
+video::-webkit-media-controls-timeline {
+  display: none !important;
+  -webkit-appearance: none !important;
+}
+video::-webkit-media-controls-volume-slider {
+  display: none !important;
+  -webkit-appearance: none !important;
+}
+video::-webkit-media-controls-fullscreen-button {
+  display: none !important;
+  -webkit-appearance: none !important;
+}
+video::-webkit-media-controls {
+  display: none !important;
+  -webkit-appearance: none !important;
+}
+
+
+::v-deep video::-webkit-media-controls {
+  display: none !important;
+  -webkit-appearance: none !important;
+}
+
+::v-deep video::-webkit-media-controls-play-button {
+  display: none !important;
+  -webkit-appearance: none !important;
+}
+
 .content-box {
   --top-box-height-: 80px;
 
@@ -966,6 +1023,10 @@ export default {
     width: 100vw;
     height: 100vh;
   }
+  #taskMedia::--webkit-media-controls-play-buton{
+    display: none!important;
+    -webkit-appearance: none!important;
+  }
 }
 
 .bandBox {
diff --git a/vue.config.js b/vue.config.js
index 15ee81c..60074cd 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -112,7 +112,7 @@ module.exports = {
     },
     proxy: {
       "/addons/yun_shop/api.php": {
-        target: "https://testbzt.cdlfjy.com/", //目标接口域名bztang.cdlfjy.com  testbzt.cdlfjy.com
+        target: "https://bztang.cdlfjy.com/", //目标接口域名bztang.cdlfjy.com  testbzt.cdlfjy.com
         changeOrigin: true, //是否跨域
         secure: false
         // pathRewrite: {