no message

src/pages/cash/index.vue

@@ -39,6 +39,7 @@ export default {
 
             user_money: 0, //余额
             available_money: 0, //数智生活可提金额
+            merchant_money: 0, //商家中心余额
 
             islocal: false
         };

src/pages/my/index.vue

@@ -312,19 +312,6 @@ export default {
                 this.goto("/pages/invi-img/index")
             }
         },
-        // 跳转到提现页面
-        getToCash(type) {
-            if (this.isAuthentication) {
-                if (this.userinfo.is_authentication == 1) {
-                    this.goto("/pages/cash/index", { type })
-                } else {
-                    this.$toast("您还未实名");
-                    this.goToAutonym();
-                }
-            } else {
-                this.goto("/pages/cash/index", { type })
-            }
-        },
         // 复制账号
         copyText(e) {
             uniCopy({

src/pagesB/my/addShop.vue

@@ -17,6 +17,9 @@
             <uni-forms-item label="商家logo" required name="logo">
                 <upimg v-model="formData.logo"/>
             </uni-forms-item>
+            <uni-forms-item label="商家账号" required name="mobile">
+                <uni-easyinput v-model="formData.mobile" type="text" placeholder="请输入商家账号，即茶付宝账号" />
+            </uni-forms-item>
             <uni-forms-item label="商家分类" required name="business">
                 <uni-data-select v-model="formData.business" :localdata="TypeDesc.business" placeholder="请选择商家分类"></uni-data-select>
             </uni-forms-item>
@@ -27,7 +30,8 @@
                 <uni-data-select v-model="formData.type" :localdata="TypeDesc.type" placeholder="请选择合作类型"></uni-data-select>
             </uni-forms-item>
             <uni-forms-item label="让利比率" required name="discount">
-                <uni-easyinput v-model="formData.discount" type="text" placeholder="请输入让利比率" />
+                <uni-easyinput v-model="formData.discount" type="text" placeholder="请输入让利比率，百分比" />
+                <div class="suffix">%</div>
             </uni-forms-item>
             <uni-forms-item label="省市区" required name="province">
                 <div class="selectAdder flex_r flex_ac flex_jb" @click="btnClick">
@@ -81,6 +85,9 @@
             <uni-forms-item label="店铺图集">
                 <upimg v-model="formData.atlas" :count="6"/>
             </uni-forms-item>
+            <uni-forms-item label="入驻协议" required name="settled">
+                <upimg v-model="formData.settled" :count="9"/>
+            </uni-forms-item>
         </uni-forms>
         <div class="btn" @click="submit">确认提交</div>
         <!-- <button class="button" @click="submit">校验表单</button> -->
@@ -102,6 +109,7 @@ export default {
             rules: {
                 name: { rules: [{ required: true, errorMessage: '请输入店铺名称' }] },
                 logo: { rules: [{ required: true, errorMessage: '请上传店铺logo' }] },
+                mobile: { rules: [{ required: true, errorMessage: '请输入商家账号，即茶付宝账号' }] },
                 business: { rules: [{ required: true, errorMessage: '请选择商家分类' }] },
                 attribute: { rules: [{ required: true, errorMessage: '请选择商家属性' }] },
                 type: { rules: [{ required: true, errorMessage: '请选择合作类型' }] },
@@ -119,6 +127,7 @@ export default {
                 account_name: { rules: [{ required: true, errorMessage: '请输入开户姓名' }] },
                 card_id: { rules: [{ required: true, errorMessage: '请输入身份证号' }] },
                 open_phone: { rules: [{ required: true, errorMessage: '请输入开户手机' }] },
+                settled: { rules: [{ required: true, errorMessage: '请上传入驻协议' }] },
             },
             TypeDesc: {},
             address: {
@@ -134,7 +143,9 @@ export default {
         submit() {
             let that = this
             this.$refs.form.validate().then((res) => {
-                post("v1/merchant/apply",this.formData).then(res=>{
+                let da = Object.assign({},this.formData);
+                da.discount = this.$h.Div(da.discount, 100);
+                post("v1/merchant/apply",da).then(res=>{
                     if (res.code == 0) {
                         that.$toast("提交成功，请关注审核状态")
                         setTimeout(() => {
@@ -243,6 +254,11 @@ export default {
             color: #888;
         }
     }
+    .suffix{
+        position: absolute;
+        top: 20rpx;
+        right: 22rpx;
+    }
 }
 .btn{
     color: #fff;

src/pagesB/orderingfood/orderlist.vue

@@ -179,14 +179,6 @@ export default {
     },
     onShow() {},
     mounted() {},
-    computed: {
-        isShow1() {
-            return this.orderList.length && this.activeKey == 1
-        },
-        isShow2() {
-            return this.selfSupportList.length && this.activeKey == 2
-        },
-    },
     onReachBottom() {
         if (this.Query.page < this.pageData.last_page) this.getList();
     },
@@ -204,13 +196,14 @@ export default {
 
         &::after {
             content: "";
-            width: 88rpx;
+            width: 100rpx;
             height: 6rpx;
             background-color: #2E57FD;
             border-radius: 5rpx;
             position: absolute;
-            left: 2rpx;
+            left: 50%;
             bottom: -8rpx;
+            transform: translate(-50%, -50%);
         }
     }
 }

src/pagesC/settledMerchant/merchant.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="hotel">
         <navcustom :config="config" class="navcustom" v-if="customShow"/>
-        <div class="head_img" @click="onpreview">
+        <div class="head_img" @click="onpreview(0)">
             <image :src="detail.atlas[0]" mode="aspectFill" class="bg_img" />
         </div>
         <div class="head_info">
@@ -83,7 +83,7 @@ export default {
                 }
             });
         },
-        onpreview(current=0) {
+        onpreview(current) {
             if (this.detail.atlas.length) {
                 this.customShow = false
                 this.$refs.previewimg.open({
@@ -236,7 +236,7 @@ export default {
     }
 }
 .atlas_list{
-    height: 334rpx;
+    max-height: 334rpx;
     overflow: hidden;
     display: grid;
     justify-content: space-between;

src/pagesC/settledMerchant/pay.vue

@@ -1,8 +1,11 @@
 <template>
     <div class="pay">
         <div class="card inpt-box">
-            <div class="tit">消费总额</div>
-            <input v-model="Body.money" @input="payCalculate" placeholder="请询问服务员后输入" class="inp bur"/>
+            <div class="big-inp flex_r flex_jb flex_ac">
+                <div class="tit">消费总额</div>
+                <input v-model="Body.money" @input="payCalculate" placeholder="请询问服务员后输入" class="inp"/>
+            </div>
+            <input v-model="Body.not_discount" @input="payCalculate" placeholder="请询问服务员后输入" class="inp bur"/>
         </div>
         <div class="money card">
             <div class="li flex_r flex_jb">
@@ -69,13 +72,19 @@ export default {
     padding: 28rpx 32rpx;
 }
 .inpt-box{
+    .big-inp{
+        margin-bottom: 20rpx;
+        .inp{
+            width: calc(100% - 258rpx);
+            font-size: 32rpx;
+        }
+    }
     .tit{
         font-size: 36rpx;
         font-weight: 600;
-        margin-bottom: 20rpx;
     }
     .inp{
-        background-color: #F6F6F6;
+        background-color: rgba($color: #000, $alpha: 0.07);
         height: 72rpx;
         line-height: 72rpx;
         border-radius: 12rpx;