xuqiang пре 4 година
родитељ
комит
dc978d5a86
4 измењених фајлова са 62 додато и 55 уклоњено
  1. 2 2
      src/pages/apply.vue
  2. 29 41
      src/pages/changeReserve.vue
  3. 8 8
      src/pages/changeText.vue
  4. 23 4
      src/pages/confirmorder.vue

+ 2 - 2
src/pages/apply.vue

@@ -76,10 +76,10 @@ export default {
                     name: '多拍/错拍/不想要'
                     name: '多拍/错拍/不想要'
                 },
                 },
                 {
                 {
-                    name: '其他原因'
+                    name: '商家联系我取消'
                 },
                 },
                 {
                 {
-                    name: '取消'
+                    name: '其他原因'
                 }
                 }
             ]
             ]
         };
         };

+ 29 - 41
src/pages/changeReserve.vue

@@ -5,68 +5,53 @@
 </config>
 </config>
 <template>
 <template>
     <div>
     <div>
-        <!-- <van-field
-            type="text"
-            clearable
-            placeholder="请输入..."
-            :value="message"
-            focus
-            @input="message = $event.detail"
-            @comfirm="message = $event.detail"
-        /> -->
-        <van-cell-group>
-            <van-field
-                :value="form.name"
-                @input="form.name = $event.detail"
-                placeholder="请填写您的姓名"
-                label="联系人"
-            />
+        <van-cell-group :border="false">
+            <van-field :value="name" @input="name = $event.detail" placeholder="请填写您的姓名" label="联系人" />
             <van-field
             <van-field
                 type="number"
                 type="number"
-                :value="form.phone"
-                @input="form.phone = $event.detail"
+                :value="phone"
+                :border="false"
+                class="aa"
+                @input="phone = $event.detail"
                 placeholder="请填写您的手机号码"
                 placeholder="请填写您的手机号码"
                 label="手机号"
                 label="手机号"
             />
             />
         </van-cell-group>
         </van-cell-group>
-        <div class="submit">
-            <van-button type="primary" block @click="submit"> 保存</van-button>
+        <div class="bottom">
+            <div class="submit">
+                <van-button type="primary" block @click="submit"> 确定</van-button>
+            </div>
         </div>
         </div>
     </div>
     </div>
 </template>
 </template>
 
 
 <script>
 <script>
+import { mapState } from 'vuex';
 export default {
 export default {
     data() {
     data() {
         return {
         return {
             name: '',
             name: '',
             phone: '',
             phone: '',
-            key: 'nickname'
+            key: 'nickname',
+            key2: 'phone'
         };
         };
     },
     },
+    computed: {
+        ...mapState(['userInfo'])
+    },
     onShow() {
     onShow() {
-        let eventChannel = this.$mp.page.getOpenerEventChannel();
-        if (eventChannel && eventChannel.on) {
-            eventChannel.on('message', data => {
-                this.message = data;
-            });
-            eventChannel.on('title', data => {
-                wx.setNavigationBarTitle({
-                    title: data.title
-                });
-                this.key = data.key;
-            });
-        }
+        this.name = this.userInfo.nickname;
+        this.phone = this.userInfo.phone;
     },
     },
     methods: {
     methods: {
         submit() {
         submit() {
             let pages = getCurrentPages();
             let pages = getCurrentPages();
             let prevPage = pages[pages.length - 2];
             let prevPage = pages[pages.length - 2];
-
             wx.navigateBack({
             wx.navigateBack({
                 success: res => {
                 success: res => {
                     prevPage.rootVM.updateInfo({
                     prevPage.rootVM.updateInfo({
-                        [this.key]: this.message
+                        [this.key]: this.name,
+                        [this.key2]: this.phone
                     });
                     });
                 }
                 }
             });
             });
@@ -83,8 +68,6 @@ export default {
 /deep/ .van-cell {
 /deep/ .van-cell {
     --cell-vertical-padding: 23px;
     --cell-vertical-padding: 23px;
     --cell-horizontal-padding: 20px;
     --cell-horizontal-padding: 20px;
-    --field-label-color: #000000;
-    --cell-text-color: #000;
     .van-field__label,
     .van-field__label,
     .van-cell__title {
     .van-cell__title {
         font-weight: bold;
         font-weight: bold;
@@ -97,12 +80,17 @@ export default {
     .van-cell__value {
     .van-cell__value {
         text-align: left;
         text-align: left;
     }
     }
-
     &::after {
     &::after {
-        left: 100px !important;
+        left: 0 !important;
+        right: 0 !important;
     }
     }
 }
 }
-.submit {
-    margin: 81px 43px 100px;
+.bottom {
+    background: #f5f7fa;
+    min-height: 590px;
+    .submit {
+        margin: 0px 43px;
+        padding-top: 62px;
+    }
 }
 }
 </style>
 </style>

+ 8 - 8
src/pages/changeText.vue

@@ -47,14 +47,14 @@ export default {
         submit() {
         submit() {
             let pages = getCurrentPages();
             let pages = getCurrentPages();
             let prevPage = pages[pages.length - 2];
             let prevPage = pages[pages.length - 2];
-
-            wx.navigateBack({
-                success: res => {
-                    prevPage.rootVM.updateInfo({
-                        [this.key]: this.message
-                    });
-                }
-            });
+            console.log(prevPage);
+            // wx.navigateBack({
+            //     success: res => {
+            //         prevPage.rootVM.updateInfo({
+            //             [this.key]: this.message
+            //         });
+            //     }
+            // });
         }
         }
     }
     }
 };
 };

+ 23 - 4
src/pages/confirmorder.vue

@@ -60,8 +60,9 @@
                 <div class="time" @click="show = true">
                 <div class="time" @click="show = true">
                     <div class="text" v-if="active == '到店自取'">
                     <div class="text" v-if="active == '到店自取'">
                         <div class="text3">预留信息</div>
                         <div class="text3">预留信息</div>
-                        <div class="textCon" @click.stop="navigateTo('/pages/changeReserve')">
-                            <div class="text2">奶盖 18789898888</div>
+                        <div class="textCon" v-if="userInfo" @click.stop="navigateTo('/pages/changeReserve')">
+                            <div class="text2 text5">{{ userInfo.nickname }}</div>
+                            <div class="text2">{{ userInfo.phone }}</div>
                             <img
                             <img
                                 style="width:12px;height:24px"
                                 style="width:12px;height:24px"
                                 src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-09-03-16-00-00LxfIfsLZ.png"
                                 src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-09-03-16-00-00LxfIfsLZ.png"
@@ -344,6 +345,22 @@ export default {
         onClickNav(event) {
         onClickNav(event) {
             this.mainActiveIndex = event.detail.index || 0;
             this.mainActiveIndex = event.detail.index || 0;
         },
         },
+        updateInfo(changeInfo = {}) {
+            let data = { ...this.userInfo, ...changeInfo };
+            this.showLoading();
+            this.$http
+                .post('/user/save', data, {
+                    header: {
+                        'Content-Type': 'application/json'
+                    }
+                })
+                .then(res => {
+                    return this.$store.dispatch('getUserInfo');
+                })
+                .then(() => {
+                    this.toast('预留成功', 'success');
+                });
+        },
         onSelectItem(event) {
         onSelectItem(event) {
             const activeId = this.activeId === event.detail.id ? null : event.detail.id;
             const activeId = this.activeId === event.detail.id ? null : event.detail.id;
             this.activeId = activeId;
             this.activeId = activeId;
@@ -498,6 +515,10 @@ export default {
                         color: #000000;
                         color: #000000;
                         line-height: 24px;
                         line-height: 24px;
                         margin-right: 5px;
                         margin-right: 5px;
+                        &.text5 {
+                            width: 77px;
+                            .ellipsis();
+                        }
                     }
                     }
                 }
                 }
             }
             }
@@ -505,7 +526,6 @@ export default {
                 width: 1px;
                 width: 1px;
                 height: 42px;
                 height: 42px;
                 background: #f5f7fa;
                 background: #f5f7fa;
-                // margin: 0 -13px;
             }
             }
             .text1 {
             .text1 {
                 .span();
                 .span();
@@ -536,7 +556,6 @@ export default {
         width: 351px;
         width: 351px;
         background: #ffffff;
         background: #ffffff;
         border-radius: 12px;
         border-radius: 12px;
-        // margin: 20px 0 0 12px;
         margin-left: 12px;
         margin-left: 12px;
         padding: 16px 0;
         padding: 16px 0;
         .store {
         .store {