浏览代码

货易优选改云宝货易

DaMowang 2 年之前
父节点
当前提交
1d41b1e447

+ 1 - 1
src/pages/index/index.vue

@@ -82,7 +82,7 @@ export default {
             // 金刚区
             area_list: [
                 {
-                    name: "货易优选",
+                    name: "云宝货易",
                     url: "https://teaclub.oss-cn-chengdu.aliyuncs.com/menu/ss.png",
                     type: 3,
                 },

+ 1 - 1
src/pages/szw-order-list/index.vue

@@ -267,7 +267,7 @@ export default {
           case 2:
             return "批发专区";
           case 3:
-            return "货易优选";
+            return "云宝货易";
           case 4:
             return "消费金电商";
           case 5:

+ 2 - 2
src/pages/to-pay-list/index.vue

@@ -210,7 +210,7 @@ export default {
                         let ys = this.$h.Mul(y, this.Data.num) //运费总价
                         let a = this.$h.Add(ps, ys); //商品总价加运费
                         let b = this.$h.Sub(a, this.userinfo.user_money); //待支付金额
-                        let b1 = this.$h.Sub(ps, this.userinfo.user_money); //待支付金额 零售&批发   运费必须现金支付
+                        let b1 = this.$h.Sub(ps, this.userinfo.user_money); //待支付金额 零售&批发&云宝货易   运费必须现金支付
                         if (this.Data.type == 4) {
 							if(this.isAct){
 								let um = this.local_uinfo.property; //数智生活模块佣金余额
@@ -225,7 +225,7 @@ export default {
 							else this.obligation = a;
 						}
                         else if (["5", "6"].includes(this.Data.type)) this.obligation = a;
-                        else if (["1", "2"].includes(this.Data.type)) this.obligation = b1 > 0 ? this.$h.Add(b1, ys) : ys;
+                        else if (["1", "2", "3"].includes(this.Data.type)) this.obligation = b1 > 0 ? this.$h.Add(b1, ys) : ys;
                         else this.obligation = b > 0 ? b : 0;
                     });
                 }

+ 8 - 26
src/pagesB/prepaidRefill/index.vue

@@ -1,30 +1,16 @@
 <template>
     <div class="prepaidRefill">
-        <div class="input_phone flex_r flex_jb flex_wrap">
-            <textarea
-                v-model="qda.phoneno"
-                placeholder="请输入手机号"
-                class="inp dinB"
-                :auto-height="true"
-                @input="inphone"
-                @blur="inphone"
-                @confirm="inphone"
-                placeholder-class="inpc"
-            />
-            <div class="ico iconfont" @click="openContact">&#xe8fb;</div>
+        <div class="input_phone">
+            <div class="flex_r flex_jb flex_ac">
+                <textarea v-model="qda.phoneno" placeholder="请输入手机号" class="inp dinB" :auto-height="true" @input="inphone" @blur="inphone" @confirm="inphone" placeholder-class="inpc" />
+                <div class="ico iconfont" @click="openContact">&#xe8fb;</div>
+            </div>
             <div class="phonemsg" v-if="gameArea">{{ gameArea }}</div>
         </div>
         <div class="items">
             <div class="tit">充话费</div>
             <div class="li flex_r">
-                <div
-                    :class="{ li_it: 1, active: qda.cardnum == i }"
-                    v-for="(i, s) in CallingList"
-                    :key="s"
-                    @click="qda.cardnum = i"
-                >
-                    {{ i }}元
-                </div>
+                <div :class="{ li_it: 1, active: qda.cardnum == i }" v-for="(i, s) in CallingList" :key="s" @click="qda.cardnum = i" >{{ i }}元</div>
             </div>
         </div>
         <div class="money card">
@@ -33,9 +19,7 @@
                 <span>¥{{ cartTotal || 0 }}</span>
             </div>
             <div class="li flex_r flex_jb">
-                <span
-                    >消费金抵扣<span class="corg">{{ Integral }}%</span></span
-                >
+                <span>消费金抵扣<span class="corg">{{ Integral }}%</span></span>
                 <span class="corg">-¥{{ deduction || 0 }}</span>
             </div>
             <div class="li flex_r flex_jb">
@@ -84,9 +68,7 @@ export default {
             let that = this;
             uni.chooseContact({
                 success: (res) => {
-                    if (that.checkPhone(res.phoneNumber)) {
-                        that.qda.phoneno = res.phoneNumber;
-                    }
+                    that.qda.phoneno = res.phoneNumber;
                 },
                 fail: (err) => {
                     console.log("获取通讯录失败:", err);

+ 1 - 1
src/utils/myfun.js

@@ -69,7 +69,7 @@ export function tidyTpye(va) {
     switch (a) {
         case 1: return "零售专区";
         case 2: return "批发专区";
-        case 3: return "货易优选";
+        case 3: return "云宝货易";
         case 4: return "消费金电商";
         case 5: return "茶宝兑换";
         case 6: return "天天捡漏";