样式更改

.env.development

@@ -1 +1 @@
-VUE_APP_BASE_URL=http://localhost:8080
+VUE_APP_BASE_URL=http://192.168.50.120:8080

.env.production

@@ -1 +1 @@
-VUE_APP_BASE_URL=http://192.168.50.104:8080
+VUE_APP_BASE_URL=http://192.168.50.120:8080

src/components/CardCase.vue

@@ -128,6 +128,10 @@ export default {
             this.nowChoose = list;
         },
         submit() {
+            if (this.nowChoose.length === 0) {
+                this.toast('请选择卡牌');
+                return;
+            }
             this.$emit('update:chooseIds', this.nowChoose);
             this.show = false;
             if (this.buy) {
@@ -164,6 +168,7 @@ export default {
 
     padding: 0 20px 0;
     .flex-col();
+    padding-bottom: 6px;
 }
 
 .content {
@@ -265,9 +270,10 @@ export default {
 }
 
 .bottom {
-    padding: 6px 0;
+    margin-top: 6px;
     border-radius: 12px;
     overflow: hidden;
+    flex-shrink: 0;
     .flex();
     .text {
         padding: 0 16px;

src/components/ProductInfo.vue

@@ -85,12 +85,14 @@ export default {
             wx.showModal({
                 content: '确定要取消关注吗？',
                 confirmColor: this.$colors.prim,
-                success: () => {
-                    this.collect().then(() => {
-                        setTimeout(() => {
-                            this.$emit('getInfo');
-                        }, 1000);
-                    });
+                success: res => {
+                    if (res.confirm) {
+                        this.collect().then(() => {
+                            setTimeout(() => {
+                                this.$emit('getInfo');
+                            }, 1000);
+                        });
+                    }
                 }
             });
         }

src/pages/Home.vue

@@ -1,6 +1,6 @@
 <config>
 {
-    "navigationBarTextStyle": "black",
+    "navigationBarTextStyle": "white",
     "backgroundTextStyle":"light",
     "navigationStyle": "custom"
 }

src/pages/confirmorder.vue

@@ -73,7 +73,13 @@
         <div class="box-buttom">
             <div class="box-buttom-con">
                 <p>订单留言</p>
-                <div class="box-buttom-p2">选填，备注对本次交易的说明</div>
+                <van-field
+                    class="message"
+                    :border="false"
+                    type="text"
+                    placeholder="选填，备注对本次交易的说明"
+                    @input="message = $event.detail"
+                />
             </div>
         </div>
         <div class="box-total">
@@ -96,7 +102,8 @@ export default {
             boxIds: [],
             Boxes: [],
             cardCaseInfo: {},
-            total: ''
+            total: '',
+            message: ''
         };
     },
     methods: {
@@ -114,7 +121,7 @@ export default {
             this.$http
                 .post('/orderInfo/createOrderInfo', {
                     caseId: this.caseId,
-                    remark: '',
+                    remark: this.message || '无',
                     boxIds: this.boxIds,
                     userAddressId: this.userAddressId
                 })
@@ -180,8 +187,7 @@ export default {
     }
     .box-top {
         height: 44px;
-        background: #ff6c00;
-        opacity: 0.46;
+        background: #ff6c0016;
         p {
             margin: 0 38px;
             line-height: 18px;
@@ -189,8 +195,7 @@ export default {
             width: 299px;
             height: 18px;
             font-size: 13px;
-            font-weight: 400;
-            color: #000000;
+            color: @prim;
             line-height: 48px;
         }
     }
@@ -367,6 +372,17 @@ export default {
                 font-weight: 400;
                 color: #c8c9cc;
             }
+
+            .message {
+                flex-grow: 1;
+                /deep/ .van-field__input {
+                    text-align: right;
+                }
+
+                /deep/ .van-cell {
+                    --cell-horizontal-padding: 0px;
+                }
+            }
         }
     }
     .box-total {

src/pages/mine.vue

@@ -42,10 +42,10 @@
             <van-grid-item text="我发布的" @click="navigateTo('/pages/minePublish')">
                 <img class="gird-icon" src="/native/svgs/info_icon_fabu.svg" slot="icon" alt="" />
             </van-grid-item>
-            <van-grid-item text="我卖出的">
+            <van-grid-item text="我卖出的" @click="wait">
                 <img class="gird-icon" src="/native/svgs/info_icon_maichu.svg" slot="icon" alt="" />
             </van-grid-item>
-            <van-grid-item text="我买到的">
+            <van-grid-item text="我买到的" @click="navigateTo('/pages/allorder')">
                 <img class="gird-icon" src="/native/svgs/info_icon_maidao.svg" slot="icon" alt="" />
             </van-grid-item>
         </van-grid>

src/pages/setting.vue

@@ -20,7 +20,7 @@
             <van-cell title="地区" is-link :class="{ not: !city }" @click="$refs.area.init()">
                 <span>{{ city || '未设置' }}</span>
             </van-cell>
-            <van-cell title="收货地址" is-link />
+            <van-cell title="收货地址" is-link @click="navigateTo('/pages/chooseAddress')" />
             <van-cell title="手机号" :class="{ not: !myInfo.phone }" is-link>
                 <span>{{ myInfo.phone || '未绑定' }}</span>
                 <van-button type="primary" open-type="getPhoneNumber" @getphonenumber="getphonenumber"
@@ -94,7 +94,20 @@ export default {
             });
         },
         getphonenumber(e) {
-            console.log(e);
+            if (e.detail.iv) {
+                this.$http
+                    .post('/user/getMaUserPhone ', {
+                        sessionKey: this.$store.state.sessionKey,
+                        errMsg: e.detail.errMsg,
+                        encryptedData: e.detail.encryptedData,
+                        iv: e.detail.iv
+                    })
+                    .then(res => {
+                        this.updateInfo({
+                            phone: res.phoneNumber
+                        });
+                    });
+            }
         },
         getSex(sex) {
             if (Number(sex) == 2) {

src/pages/store/apply.vue

@@ -0,0 +1,9 @@
+<template>
+    <div></div>
+</template>
+
+<script>
+export default {};
+</script>
+
+<style></style>

src/pages/wallet.vue

@@ -16,7 +16,7 @@
         <div class="top">
             <div class="left">
                 <div class="text1">我的余额</div>
-                <div class="text2">308.00</div>
+                <div class="text2">{{ moneyInfo.money || 0 }}</div>
             </div>
 
             <van-button type="default" size="small">
@@ -31,17 +31,22 @@
                 </van-dropdown-menu>
                 <div class="flex1"></div>
                 <span class="text">
-                    收入 ¥6832.50
+                    收入 0
                 </span>
                 <span class="text">
-                    提现 ¥5200.00
+                    提现 0
                 </span>
             </div>
         </van-sticky>
 
         <div class="list">
-            <bill-info></bill-info>
-            <bill-info billType="pay"></bill-info>
+            <van-empty v-if="empty" image="/native/imgs/kong_png_wodeguanzhu.png" description="暂无收益记录哦">
+            </van-empty>
+
+            <template v-else>
+                <bill-info></bill-info>
+                <bill-info billType="pay"></bill-info>
+            </template>
         </div>
     </div>
 </template>
@@ -54,9 +59,23 @@ export default {
     name: 'Wallet',
     data() {
         return {
+            moneyInfo: {},
             time: 0,
-            option1: [{ text: '全部商品', value: 0 }, { text: '新款商品', value: 1 }, { text: '活动商品', value: 2 }]
+            option1: [{ text: '2012年5月', value: 0 }],
+            empty: true
         };
+    },
+    methods: {
+        loginMethods() {
+            this.$http.get('/memberInfo/findByUser').then(res => {
+                this.moneyInfo = res;
+            });
+        },
+        getList() {
+            this.$http.postJson('/memberInfo/all', {
+                query: {}
+            });
+        }
     }
 };
 </script>