Merge branch 'dev' of http://git.izouma.com/xiongzhu/raex_front into dev

src/views/account/ChangeText.vue

@@ -1,6 +1,9 @@
 <template>
     <div class="change" v-if="type === 'nickname'">
-        <div class="title">昵称</div>
+        <div class="title" @click="$router.back()">
+            <img :src="require('@assets/goback.png')" alt="" class="title_img" />
+            <div>昵称</div>
+        </div>
         <van-field
             v-model="message"
             :rows="1"
@@ -23,7 +26,10 @@
         </div>
     </div>
     <div class="change" v-else-if="type === 'autograph'">
-        <div class="title">简介</div>
+        <div class="title" @click="$router.back()">
+            <img :src="require('@assets/goback.png')" alt="" class="title_img" />
+            <div>简介</div>
+        </div>
         <van-field
             v-model="info.autograph"
             :rows="4"
@@ -46,7 +52,10 @@
         </div>
     </div>
     <div class="change" v-else-if="type === 'school'">
-        <div class="title">学校</div>
+        <div class="title" @click="$router.back()">
+            <img :src="require('@assets/goback.png')" alt="" class="title_img" />
+            <div>学校</div>
+        </div>
         <van-field
             v-model="info.school"
             :rows="1"
@@ -69,7 +78,10 @@
         </div>
     </div>
     <div class="change" v-else-if="type === 'occupation'">
-        <div class="title">职业</div>
+        <div class="title" @click="$router.back()">
+            <img :src="require('@assets/goback.png')" alt="" class="title_img" />
+            <div>职业</div>
+        </div>
         <van-field
             v-model="info.occupation"
             :rows="1"
@@ -92,7 +104,10 @@
         </div>
     </div>
     <div class="change" v-else-if="type === 'company'">
-        <div class="title">公司</div>
+        <div class="title" @click="$router.back()">
+            <img :src="require('@assets/goback.png')" alt="" class="title_img" />
+            <div>公司</div>
+        </div>
         <van-field
             v-model="info.company"
             :rows="1"
@@ -115,7 +130,10 @@
         </div>
     </div>
     <div class="change" v-else-if="type === 'mailbox'">
-        <div class="title">邮箱</div>
+        <div class="title" @click="$router.back()">
+            <img :src="require('@assets/goback.png')" alt="" class="title_img" />
+            <div>邮箱</div>
+        </div>
         <van-field
             v-model="info.mail"
             :rows="1"
@@ -269,6 +287,14 @@ export default {
 }
 .title {
     padding: 23px 16px;
+    display: flex;
+    align-items: center;
+    .title_img {
+        margin-top: 2px;
+        width: 24px;
+        height: 24px;
+        margin-right: 10px;
+    }
 }
 .btn {
     padding: 100px 50px;

src/views/user/ShoppingCart.vue

@@ -221,6 +221,9 @@ export default {
                 this.price = 0;
                 this.totalSettlement = this.collectionList.length;
                 this.collectionList.forEach(item => {
+                    if (item.enabled == false) {
+                        item.price = 0;
+                    }
                     item.check = true;
                     this.price += Number(item.price);
                 });
@@ -361,7 +364,7 @@ export default {
                     enabled: false
                 };
             }
-            let sort = 'createdAt,desc';
+            let sort = 'enabled,desc';
             let url = '/cart/all';
             return this.$http
                 .post(

src/views/user/ShoppingCartSubmit.vue

@@ -96,12 +96,18 @@ export default {
         });
         if (this.$route.query.id) {
             let collectionIdList = this.$route.query.id;
-            this.collectionIds = collectionIdList.join(',');
-            collectionIdList.forEach(item => {
-                this.$http.get('/collection/get/' + item).then(res => {
+            if (collectionIdList.length == 7) {
+                this.$http.get('/collection/get/' + collectionIdList).then(res => {
                     this.collectionList.push(res);
                 });
-            });
+            } else {
+                this.collectionIds = collectionIdList.join(',');
+                collectionIdList.forEach(item => {
+                    this.$http.get('/collection/get/' + item).then(res => {
+                        this.collectionList.push(res);
+                    });
+                });
+            }
         }
     },
     methods: {