电子合同

src/pagesC/settledMerchant/addShop.vue

@@ -860,7 +860,7 @@ export default {
                                 content: res1.data,
                                 success: (res2) => {
                                     uni.showToast({
-                                        title: "已复制到剪贴板",
+                                        title: "电子合同链接已复制到剪贴板，如不能正常打开，请转至浏览器粘贴打开",
                                         icon: "none",
                                         duration: 2000,
                                     });

src/pagesC/settledMerchant/myBusiness.vue

@@ -27,12 +27,19 @@
                     <div>今日流水：{{i.day_stream || "0.00"}}</div>
                     <div>总流水：{{i.total_stream || "0.00"}}</div>
                 </div>
+                <div class="p1 flex_r">
+                    <div>当前状态：{{statusList[i.status]}}</div>
+                    
+                </div>
                 <div class="p1" v-if="i.remark">
                     <div class="remark">审核结果：{{i.remark || ""}}</div>
                 </div>
                 <div class="btn" v-if="i.status == 3">
                     <button class="button" size="mini" type="primary" @click="goto('/pagesC/settledMerchant/addShop',{id:i.id})">修改</button>
                 </div>
+                <div class="btn" v-if="i.status == 1">
+                    <button class="button" size="mini" type="primary" @click="contract(i.ec_apply_id)">去签约</button>
+                </div>
             </div>
         </div>
         <empty v-else/>
@@ -43,6 +50,7 @@
 import empty from "@/pagesC/components/empty/empty"
 import createCode from "@/pagesC/components/createCode/index"
 import { post } from "@/request/api.js";
+import uniCopy from "@/utils/copy";
 export default {
     name: "myBusiness",
     props: {},
@@ -50,6 +58,7 @@ export default {
     data() {
         return {
             tabs: [
+                { status: 0, text: "全部" },
                 { status: 2, text: "已审核" },
                 { status: 1, text: "待审核" },
                 { status: 3, text: "未通过" },
@@ -58,9 +67,11 @@ export default {
             Query: {
                 page: 1,
                 rows: 20,
-                status: 2
+                status: 0
             },
+            statusList: [],
             pageData: {},
+            // status 0申请中 1合同失败 2进件中 3进件失败 4增终进件中 5待认证 6分账绑定中 7分账绑定失败 8通过 9锁定
         };
     },
     methods: {
@@ -71,9 +82,10 @@ export default {
             }
             post("v1/merchant/myMerchant", this.Query).then(res => {
                 if (res.code == 0) {
-                    let da = res.data.data
-                    delete res.data.data
-                    this.pageData = res.data
+                    this.statusList = res.data.list_status
+                    let da = res.data.list.data
+                    delete res.data.list.data
+                    this.pageData = res.data.list
                     this.list = [...this.list, ...da]
                     this.Query.page++
                     uni.hideLoading()
@@ -87,6 +99,25 @@ export default {
         },
         showcode(da) {
             this.$refs.createCode.showCanvas(da)
+        },
+        contract(ec_apply_id) {
+            post("v1/lakala/getEcqStatus", {ec_apply_id: ec_apply_id}).then(res => {
+                if (res.code == 0) {
+                    uniCopy({
+                        content:res.data.signH5Url,
+                        success: (res2) => {
+                            uni.showToast({
+                                title: "电子合同链接已复制到剪贴板，如不能正常打开，请转至浏览器粘贴打开",
+                                icon: "none",
+                                duration: 2000,
+                            });
+                        },
+                        error: (e) => {},
+                    });
+                    this.goto("/pagesB/my/eleContract?url="+encodeURIComponent(res.data.signH5Url));
+                }
+            })
+            
         }
     },
     onLoad(da) {
@@ -113,10 +144,12 @@ export default {
     font-size: 30rpx;
     font-weight: 600;
     margin-bottom: 18rpx;
-
+    div {
+        text-align: center;
+        width: 88rpx;
+    }
     .active {
         position: relative;
-
         &::after {
             content: "";
             width: 88rpx;

src/pagesC/settledMerchant/myShop.vue

@@ -44,11 +44,17 @@
                         <div class="total_money" @click.stop="goto('/pagesC/settledMerchant/shopOrderLog',{s:1,shop_id: i.shop_id})">总收入<span>￥{{i.total_money || "0.00"}}</span></div>
                         <div class="day_income" @click.stop="goto('/pagesC/settledMerchant/shopOrderLog',{s:1,shop_id: i.shop_id})">今日收入<span>￥{{i.day_income || "0.00"}}</span></div>
                     </div>
-                    <div class="total_money" v-if="i.status == 5" @click.stop="goto('/pagesC/settledMerchant/rz',{merchant_no: i.merchant_no,contract_no: i.contract_no,mobile: i.mobile})">微信认证
-                        <span class="rzStatus">未认证></span>
-                    </div>
-                    <div class="total_money" v-else-if="i.status >= 6">微信认证
-                        <span class="rzfStatus">已认证</span>
+                    <div class="flex_r flex_jb flex_ac">
+                        <div class="total_money" v-if="i.status == 5" @click.stop="goto('/pagesC/settledMerchant/rz',{merchant_no: i.merchant_no,contract_no: i.contract_no,mobile: i.mobile})">微信认证
+                            <span class="rzStatus">未认证></span>
+                        </div>
+                        <div class="total_money" v-else-if="i.status >= 6">微信认证
+                            <span class="rzfStatus">已认证</span>
+                        </div>
+                        <div class="total_money" @click.stop="copyText(i.merchant_no)">商户号
+                            <span>{{ i.merchant_no }}</span>
+                            <span class="iconfont copy">&#xe602;</span>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -274,12 +280,15 @@ export default {
                 color: rgb(110, 230, 150);
             }
             div{
-                padding-top: 20rpx;
+                // padding-top: 20rpx;
                 // height: 90rpx;
                 // line-height: 90rpx;
             }
             div:first-child {
-                padding-top: 10rpx;
+                padding-top: 12rpx;
+            }
+            div:last-child {
+                padding-top: 12rpx;
             }
         }
     }