xuqiang 4 anni fa
parent
commit
5749d51f1d
4 ha cambiato i file con 46 aggiunte e 39 eliminazioni
  1. 1 1
      src/pages/allorder.vue
  2. 8 8
      src/pages/chooseAddress.vue
  3. 1 1
      src/pages/confirmorder.vue
  4. 36 29
      src/pages/evaluate.vue

+ 1 - 1
src/pages/allorder.vue

@@ -99,7 +99,7 @@ export default {
         padding: 18px 65px 10px 20px;
         .tab-item {
             font-size: 14px;
-            color: #ccc;
+            color: #cccccc;
             line-height: 24px;
 
             &.active {

+ 8 - 8
src/pages/chooseAddress.vue

@@ -54,15 +54,15 @@ export default {
             this.empty = false;
         },
         // 添加到确认订单
-        add(item) {
-            let pages = getCurrentPages();
-            let prevPage = pages[pages.length - 2];
-            prevPage.rootVM.userAddressId = item.id;
-            prevPage.rootVM.addressList = item;
-            wx.navigateBack();
-        },
+        // add(item) {
+        //     let pages = getCurrentPages();
+        //     let prevPage = pages[pages.length - 2];
+        //     prevPage.rootVM.userAddressId = item.id;
+        //     prevPage.rootVM.addressList = item;
+        //     wx.navigateBack();
+        // },
         choose(info) {
-            console.log(info);
+            // console.log(info);
             if (this.pageType === 'order') {
                 let pages = getCurrentPages();
                 let prevPage = pages[pages.length - 2];

+ 1 - 1
src/pages/confirmorder.vue

@@ -50,7 +50,7 @@
                     </div>
                     <div class="border"></div>
                     <div class="time" @click="show = true">
-                        <div class="text1">{{ `${active == '外卖配送' ? '立即送出' : '自取时间'}` }}</div>
+                        <div class="text1">{{ active == '外卖配送' ? '立即送出' : '自取时间' }}</div>
                         <div class="time1">
                             <div class="text2">{{ active == '外卖配送' ? `预计${time}配送` : `预计${time}自取` }}</div>
                             <img

+ 36 - 29
src/pages/evaluate.vue

@@ -90,15 +90,20 @@
             <div class="text1">最多上传三张</div>
         </div>
         <div class="bottom">
-            <div class="text">
-                <div class="text1">鸡翅-对</div>
+            <div class="text" v-for="(item, index) in lists" :key="index">
+                <div class="text1">{{ item.name }}</div>
                 <div class="text2">
                     <div class="text3">
                         <van-image
                             width="16"
                             height="16"
                             lazy-load
-                            src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-09-06-11-18-56FYFucJaK.png"
+                            @click="stepFlag"
+                            :src="
+                                `https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/${
+                                    stepflag ? '2021-09-06-11-21-07FIiyRFOr.png' : '2021-09-06-11-18-56FYFucJaK.png'
+                                }`
+                            "
                         />
                         <div class="text4">踩</div>
                     </div>
@@ -107,30 +112,12 @@
                             width="16"
                             height="16"
                             lazy-load
-                            src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-09-06-11-19-33eTFCBfIW.png"
-                        />
-                        <div class="text4">赞</div>
-                    </div>
-                </div>
-            </div>
-            <div class="text">
-                <div class="text1">寿司</div>
-                <div class="text2">
-                    <div class="text3">
-                        <van-image
-                            width="16"
-                            height="16"
-                            lazy-load
-                            src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-09-06-11-21-07FIiyRFOr.png"
-                        />
-                        <div class="text4">踩</div>
-                    </div>
-                    <div class="text3">
-                        <van-image
-                            width="16"
-                            height="16"
-                            lazy-load
-                            src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-09-06-11-21-26mmGMCJVF.png"
+                            @click="fabulousFlag"
+                            :src="
+                                `https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/${
+                                    fabulous ? '2021-09-06-11-19-33eTFCBfIW.png' : '2021-09-06-11-21-26mmGMCJVF.png'
+                                }`
+                            "
                         />
                         <div class="text4">赞</div>
                     </div>
@@ -149,7 +136,10 @@ export default {
             form: {},
             list: [],
             flag: false,
+            stepflag: false,
+            fabulous: false,
             img: [],
+            lists: [{ name: '寿司' }],
             images: []
         };
     },
@@ -194,6 +184,24 @@ export default {
             } else {
                 this.flag = true;
             }
+        },
+        stepFlag() {
+            if (this.stepflag === true) {
+                this.stepflag = false;
+                this.fabulous = false;
+            } else {
+                this.stepflag = true;
+                this.fabulous = false;
+            }
+        },
+        fabulousFlag() {
+            if (this.fabulous === true) {
+                this.stepflag = false;
+                this.fabulous = false;
+            } else {
+                this.fabulous = true;
+                this.stepflag = false;
+            }
         }
     }
 };
@@ -269,14 +277,13 @@ export default {
     }
     .bottom {
         width: 351px;
-        height: 64px;
         padding: 20px 0;
         background: #ffffff;
         border-radius: 12px;
         .text {
             .flex();
             justify-content: space-between;
-            margin: 0 12px 16px;
+            margin: 0 12px;
             .text1 {
                 .span();
             }