From 1afb0ce5f877c848eb0918b486b74710506b4f88 Mon Sep 17 00:00:00 2001
From: Gao xiaosong <704041637@qq.com>
Date: Sun, 13 Sep 2020 22:49:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AA=E4=BA=BA=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83,=E8=B4=AD=E7=89=A9=E8=BD=A6=E7=A9=BA=E7=99=BD?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js                   |   2 +-
 pages/home/index.vue              |   3 -
 pages/shop/ShoppingCart/index.vue | 735 +++++++++++++++---------------
 pages/user/User/index.vue         |   4 +-
 剩余问题.js                   |   6 +-
 5 files changed, 362 insertions(+), 388 deletions(-)

diff --git a/config/index.js b/config/index.js
index d55cb76..b46828a 100644
--- a/config/index.js
+++ b/config/index.js
@@ -2,6 +2,6 @@
 // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
 // export const VUE_APP_API_URL = 'http://192.168.31.223:8008/api';
-export const VUE_APP_API_URL = 'http://h5api.xinxintuan.co/api';
+export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
 export const VUE_APP_RESOURCES_URL = 'https://wx.yixiang.co/static';
 
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 73f4567..5956cd8 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -21,9 +21,6 @@
 			<view class="qr" @click="startQr()">
 				<image src="@/static/images/qr.png" />
 			</view>
-			<view class="qr" @click="$yrouter.push({path:'/pages/shop/GoodsEvaluate/index'})">
-				<image src="@/static/images/qr.png" />
-			</view>
 		</view>
 		<Banner :banner="banner" @getbgcolor="getbgcolor"></Banner>
 		<uni-notice-bar scrollable="true" @click="goRoll(singNew)" single="true" :speed="10" showIcon="true"
diff --git a/pages/shop/ShoppingCart/index.vue b/pages/shop/ShoppingCart/index.vue
index 36f2a7e..8404e51 100644
--- a/pages/shop/ShoppingCart/index.vue
+++ b/pages/shop/ShoppingCart/index.vue
@@ -17,19 +17,13 @@
           购物数量
           <text class="num font-color-red">{{ count }}</text>
         </view>
-        <view
-          v-if="cartList.valid.length > 0"
-          class="administrate acea-row row-center-wrapper"
-          @click="manage"
-        >{{ footerswitch ? '取消' : '管理' }}</view>
+        <view v-if="cartList.valid.length > 0" class="administrate acea-row row-center-wrapper" @click="manage">
+          {{ footerswitch ? '取消' : '管理' }}</view>
       </view>
       <view v-if="validList.length > 0 || cartList.invalid.length > 0">
         <view class="list">
-          <view
-            class="item acea-row row-between-wrapper"
-            v-for="(item, cartListValidIndex) in validList"
-            :key="cartListValidIndex"
-          >
+          <view class="item acea-row row-between-wrapper" v-for="(item, cartListValidIndex) in validList"
+            :key="cartListValidIndex">
             <view class="select-btn">
               <view class="checkbox-wrapper">
                 <checkbox-group @change="switchSelect(cartListValidIndex)">
@@ -46,31 +40,19 @@
               </view>
               <view class="text">
                 <view class="line1">{{ item.productInfo.storeName }}</view>
-                <view
-                  class="infor line1"
-                  v-if="item.productInfo.attrInfo"
-                >属性：{{ item.productInfo.attrInfo.sku }}</view>
+                <view class="infor line1" v-if="item.productInfo.attrInfo">属性：{{ item.productInfo.attrInfo.sku }}</view>
                 <view class="money">￥{{ item.truePrice }}</view>
               </view>
               <view class="carnum acea-row row-center-wrapper">
-                <view
-                  class="reduce"
-                  :class="validList[cartListValidIndex].cartNum <= 1 ? 'on' : ''"
-                  @click.prevent="reduce(cartListValidIndex)"
-                >-</view>
+                <view class="reduce" :class="validList[cartListValidIndex].cartNum <= 1 ? 'on' : ''"
+                  @click.prevent="reduce(cartListValidIndex)">-</view>
                 <view class="num">{{ item.cartNum }}</view>
-                <view
-                  class="plus"
-                  v-if="validList[cartListValidIndex].attrInfo"
+                <view class="plus" v-if="validList[cartListValidIndex].attrInfo"
                   :class="validList[cartListValidIndex].cartNum >= validList[cartListValidIndex].attrInfo.stock ? 'on' : ''"
-                  @click.prevent="plus(cartListValidIndex)"
-                >+</view>
-                <view
-                  class="plus"
-                  v-else
+                  @click.prevent="plus(cartListValidIndex)">+</view>
+                <view class="plus" v-else
                   :class="validList[cartListValidIndex].cartNum >= validList[cartListValidIndex].stock ? 'on' : ''"
-                  @click.prevent="plus(cartListValidIndex)"
-                >+</view>
+                  @click.prevent="plus(cartListValidIndex)">+</view>
               </view>
             </view>
           </view>
@@ -78,25 +60,15 @@
         <view class="invalidGoods" v-if="cartList.invalid.length > 0">
           <view class="goodsNav acea-row row-between-wrapper">
             <view @click="goodsOpen">
-              <text
-                class="iconfont"
-                :class="goodsHidden === true ? 'icon-xiangyou' : 'icon-xiangxia'"
-              ></text>失效商品
+              <text class="iconfont" :class="goodsHidden === true ? 'icon-xiangyou' : 'icon-xiangxia'"></text>失效商品
             </view>
             <view class="del" @click="delInvalidGoods">
               <text class="iconfont icon-shanchu1"></text>清空
             </view>
           </view>
           <view class="goodsList" :hidden="goodsHidden">
-            <view
-              v-for="(item, cartListinvalidIndex) in cartList.invalid"
-              :key="cartListinvalidIndex"
-            >
-              <view
-                @click="goGoodsCon(item)"
-                class="item acea-row row-between-wrapper"
-                v-if="item.productInfo"
-              >
+            <view v-for="(item, cartListinvalidIndex) in cartList.invalid" :key="cartListinvalidIndex">
+              <view @click="goGoodsCon(item)" class="item acea-row row-between-wrapper" v-if="item.productInfo">
                 <view class="invalid acea-row row-center-wrapper">失效</view>
                 <view class="pictrue">
                   <image :src="item.productInfo.attrInfo.image" v-if="item.productInfo.attrInfo" />
@@ -104,10 +76,8 @@
                 </view>
                 <view class="text acea-row row-column-between">
                   <view class="line1">{{ item.productInfo.storeName }}</view>
-                  <view
-                    class="infor line1"
-                    v-if="item.productInfo.attrInfo"
-                  >属性：{{ item.productInfo.attrInfo.sku }}</view>
+                  <view class="infor line1" v-if="item.productInfo.attrInfo">属性：{{ item.productInfo.attrInfo.sku }}
+                  </view>
                   <view class="acea-row row-between-wrapper">
                     <view class="end">该商品已下架</view>
                   </view>
@@ -160,77 +130,96 @@
         </view>
       </view>
     </view>
-    <Authorization v-if="!$store.getters.token" />
+    <Authorization v-else />
   </view>
 </template>
 <script>
-import Recommend from "@/components/Recommend";
-import Authorization from "@/pages/authorization/index";
-import { mapGetters } from "vuex";
+  import Recommend from "@/components/Recommend";
+  import Authorization from "@/pages/authorization/index";
+  import {
+    mapGetters
+  } from "vuex";
 
-import {
-  getCartList,
-  postCartDel,
-  changeCartNum,
-  getCartCount
-} from "@/api/store";
-import { postCollectAll } from "@/api/user";
-import { mul, add } from "@/utils/bc";
-import cookie from "@/utils/store/cookie";
+  import {
+    getCartList,
+    postCartDel,
+    changeCartNum,
+    getCartCount
+  } from "@/api/store";
+  import {
+    postCollectAll
+  } from "@/api/user";
+  import {
+    mul,
+    add
+  } from "@/utils/bc";
+  import cookie from "@/utils/store/cookie";
 
-const CHECKED_IDS = "cart_checked";
+  const CHECKED_IDS = "cart_checked";
 
-export default {
-  name: "ShoppingCart",
-  components: {
-    Recommend,
-    Authorization
-  },
-  props: {},
-  data: function() {
-    return {
-      cartList: {
-        invalid: [],
-        valid: []
-      },
-      validList: [],
-      isAllSelect: false,
-      cartCount: 0,
-      countmoney: 0,
-      goodsHidden: true,
-      footerswitch: false,
-      count: 0,
-      checkedIds: [],
-      loaded: false
-    };
-  },
-  computed: mapGetters(["userInfo", "token"]),
+  export default {
+    name: "ShoppingCart",
+    components: {
+      Recommend,
+      Authorization
+    },
+    props: {},
+    data: function () {
+      return {
+        cartList: {
+          invalid: [],
+          valid: []
+        },
+        validList: [],
+        isAllSelect: false,
+        cartCount: 0,
+        countmoney: 0,
+        goodsHidden: true,
+        footerswitch: false,
+        count: 0,
+        checkedIds: [],
+        loaded: false
+      };
+    },
+    computed: mapGetters(["userInfo", "token"]),
 
-  //   watch: {
-  //     $yroute(n) {
-  //       if (n.name === "ShoppingCart") {
-  //         this.carnum();
-  //         this.countMoney();
-  //         this.getCartList();
-  //         this.gainCount();
-  //         this.goodsHidden = true;
-  //         this.footerswitch = false;
-  //       }
-  //     },
-  //     cartList(list) {
-  //       this.validList = list.valid;
-  //     }
-  //   },
-  watch: {
-    userInfo(user) {
-      if (user.uid) {
-        this.carnum();
-        this.countMoney();
-        this.getCartList();
-        this.gainCount();
+    //   watch: {
+    //     $yroute(n) {
+    //       if (n.name === "ShoppingCart") {
+    //         this.carnum();
+    //         this.countMoney();
+    //         this.getCartList();
+    //         this.gainCount();
+    //         this.goodsHidden = true;
+    //         this.footerswitch = false;
+    //       }
+    //     },
+    //     cartList(list) {
+    //       this.validList = list.valid;
+    //     }
+    //   },
+    watch: {
+      userInfo(user) {
+        if (user.uid) {
+          this.carnum();
+          this.countMoney();
+          this.getCartList();
+          this.gainCount();
+        }
+      },
+      token(token) {
+        if (this.userInfo.uid) {
+          this.carnum();
+          this.countMoney();
+          this.getCartList();
+          this.gainCount();
+        }
+      },
+      cartList(list) {
+        this.validList = list.valid;
       }
     },
-    token(token) {
+    onShow: function () {
       if (this.userInfo.uid) {
         this.carnum();
         this.countMoney();
@@ -238,297 +227,285 @@ export default {
         this.gainCount();
       }
     },
-    cartList(list) {
-      this.validList = list.valid;
-    }
-  },
-  onShow: function() {
-    if (this.userInfo.uid) {
-      this.carnum();
-      this.countMoney();
-      this.getCartList();
-      this.gainCount();
-    }
-  },
-  methods: {
-    goGoodsCon(item) {
-      this.$yrouter.push({
-        path: "/pages/shop/GoodsCon/index",
-        query: {
-          id: item.productId
-        }
-      });
-    },
-    getCartList: function() {
-      let that = this;
-      getCartList().then(res => {
-        that.cartList = res.data;
-        let checkedIds = cookie.get(CHECKED_IDS) || [];
-        if (!Array.isArray(checkedIds)) checkedIds = [];
-        this.cartList.valid.forEach(cart => {
-          if (checkedIds.indexOf(cart.id) !== -1) cart.checked = true;
+    methods: {
+      goGoodsCon(item) {
+        this.$yrouter.push({
+          path: "/pages/shop/GoodsCon/index",
+          query: {
+            id: item.productId
+          }
+        });
+      },
+      getCartList: function () {
+        let that = this;
+        getCartList().then(res => {
+          that.cartList = res.data;
+          let checkedIds = cookie.get(CHECKED_IDS) || [];
+          if (!Array.isArray(checkedIds)) checkedIds = [];
+          this.cartList.valid.forEach(cart => {
+            if (checkedIds.indexOf(cart.id) !== -1) cart.checked = true;
+          });
+          if (checkedIds.length) {
+            that.checkedIds = checkedIds;
+            that.isAllSelect = checkedIds.length === this.cartList.valid.length;
+            that.carnum();
+            that.countMoney();
+          }
+          this.loaded = true;
+        });
+      },
+      //删除商品；
+      delgoods: function () {
+        let that = this,
+          id = [],
+          valid = [],
+          list = that.cartList.valid;
+        list.forEach(function (val) {
+          if (val.checked === true) {
+            id.push(val.id);
+          }
         });
-        if (checkedIds.length) {
-          that.checkedIds = checkedIds;
-          that.isAllSelect = checkedIds.length === this.cartList.valid.length;
+        if (id.length === 0) {
+          uni.showToast({
+            title: "请选择产品",
+            icon: "none",
+            duration: 2000
+          });
+          return;
+        }
+        postCartDel(id).then(function () {
+          list.forEach(function (val, i) {
+            if (val.checked === false || val.checked === undefined)
+              valid.push(list[i]);
+          });
+          that.$set(that.cartList, "valid", valid);
           that.carnum();
           that.countMoney();
-        }
-        this.loaded = true;
-      });
-    },
-    //删除商品；
-    delgoods: function() {
-      let that = this,
-        id = [],
-        valid = [],
-        list = that.cartList.valid;
-      list.forEach(function(val) {
-        if (val.checked === true) {
+          that.gainCount();
+          that.getCartList();
+        });
+      },
+      // //获取数量
+      gainCount: function () {
+        let that = this;
+        getCartCount().then(res => {
+          that.count = res.data.count;
+        });
+      },
+      //清除失效产品；
+      delInvalidGoods: function () {
+        let that = this,
+          id = [],
+          list = that.cartList.invalid;
+        list.forEach(function (val) {
           id.push(val.id);
-        }
-      });
-      if (id.length === 0) {
-        uni.showToast({
-          title: "请选择产品",
-          icon: "none",
-          duration: 2000
         });
-        return;
-      }
-      postCartDel(id).then(function() {
-        list.forEach(function(val, i) {
-          if (val.checked === false || val.checked === undefined)
-            valid.push(list[i]);
+        postCartDel(id).then(function () {
+          list.splice(0, list.length);
+          that.gainCount();
+          that.getCartList();
         });
-        that.$set(that.cartList, "valid", valid);
-        that.carnum();
-        that.countMoney();
-        that.gainCount();
-        that.getCartList();
-      });
-    },
-    // //获取数量
-    gainCount: function() {
-      let that = this;
-      getCartCount().then(res => {
-        that.count = res.data.count;
-      });
-    },
-    //清除失效产品；
-    delInvalidGoods: function() {
-      let that = this,
-        id = [],
-        list = that.cartList.invalid;
-      list.forEach(function(val) {
-        id.push(val.id);
-      });
-      postCartDel(id).then(function() {
-        list.splice(0, list.length);
-        that.gainCount();
-        that.getCartList();
-      });
-    },
-    //批量收藏;
-    collectAll: function() {
-      let that = this,
-        data = {
-          id: [],
-          category: ""
-        },
-        list = that.cartList.valid;
-      list.forEach(function(val) {
-        if (val.checked === true) {
-          data.id.push(val.product_id);
-          data.category = val.type;
+      },
+      //批量收藏;
+      collectAll: function () {
+        let that = this,
+          data = {
+            id: [],
+            category: ""
+          },
+          list = that.cartList.valid;
+        list.forEach(function (val) {
+          if (val.checked === true) {
+            data.id.push(val.product_id);
+            data.category = val.type;
+          }
+        });
+        if (data.id.length === 0) {
+          uni.showToast({
+            title: "请选择产品",
+            icon: "none",
+            duration: 2000
+          });
+          return;
         }
-      });
-      if (data.id.length === 0) {
-        uni.showToast({
-          title: "请选择产品",
-          icon: "none",
-          duration: 2000
+        postCollectAll(data).then(function () {
+          uni.showToast({
+            title: "收藏成功!",
+            icon: "none",
+            duration: 2000
+          });
         });
-        return;
-      }
-      postCollectAll(data).then(function() {
-        uni.showToast({
-          title: "收藏成功!",
-          icon: "none",
-          duration: 2000
+      },
+      //立即下单；
+      placeOrder: function () {
+        let that = this,
+          list = that.cartList.valid,
+          id = [];
+        list.forEach(function (val) {
+          if (val.checked === true) {
+            id.push(val.id);
+          }
         });
-      });
-    },
-    //立即下单；
-    placeOrder: function() {
-      let that = this,
-        list = that.cartList.valid,
-        id = [];
-      list.forEach(function(val) {
-        if (val.checked === true) {
-          id.push(val.id);
+        if (id.length === 0) {
+          uni.showToast({
+            title: "请选择产品",
+            icon: "none",
+            duration: 2000
+          });
+          return;
         }
-      });
-      if (id.length === 0) {
-        uni.showToast({
-          title: "请选择产品",
-          icon: "none",
-          duration: 2000
+        this.$yrouter.push({
+          path: "/pages/order/OrderSubmission/index",
+          query: {
+            id: id.join(",")
+          }
         });
-        return;
-      }
-      this.$yrouter.push({
-        path: "/pages/order/OrderSubmission/index",
-        query: {
-          id: id.join(",")
+      },
+      manage: function () {
+        let that = this;
+        that.footerswitch = !that.footerswitch;
+      },
+      goodsOpen: function () {
+        let that = this;
+        that.goodsHidden = !that.goodsHidden;
+      },
+      //加
+      plus: function (index) {
+        let that = this;
+        let list = that.cartList.valid[index];
+        list.cartNum++;
+        if (list.attrInfo) {
+          if (list.cartNum >= list.attrInfo.stock) {
+            that.$set(list, "cart_num", list.attrInfo.stock);
+          }
+        } else {
+          if (list.cartNum >= list.stock) {
+            that.$set(list, "cart_num", list.stock);
+          }
         }
-      });
-    },
-    manage: function() {
-      let that = this;
-      that.footerswitch = !that.footerswitch;
-    },
-    goodsOpen: function() {
-      let that = this;
-      that.goodsHidden = !that.goodsHidden;
-    },
-    //加
-    plus: function(index) {
-      let that = this;
-      let list = that.cartList.valid[index];
-      list.cartNum++;
-      if (list.attrInfo) {
-        if (list.cartNum >= list.attrInfo.stock) {
-          that.$set(list, "cart_num", list.attrInfo.stock);
+        that.carnum();
+        that.countMoney();
+        that.syncCartNum(list);
+      },
+      //减
+      reduce: function (index) {
+        let that = this;
+        let list = that.cartList.valid[index];
+        if (list.cartNum <= 1) {
+          uni.showToast({
+            title: "已经是底线啦!",
+            icon: "none",
+            duration: 2000
+          });
+          return;
         }
-      } else {
-        if (list.cartNum >= list.stock) {
-          that.$set(list, "cart_num", list.stock);
+        list.cartNum--;
+        if (list.cartNum < 1) {
+          that.$set(list, "cart_num", 1);
         }
-      }
-      that.carnum();
-      that.countMoney();
-      that.syncCartNum(list);
-    },
-    //减
-    reduce: function(index) {
-      let that = this;
-      let list = that.cartList.valid[index];
-      if (list.cartNum <= 1) {
-        uni.showToast({
-          title: "已经是底线啦!",
-          icon: "none",
-          duration: 2000
-        });
-        return;
-      }
-      list.cartNum--;
-      if (list.cartNum < 1) {
-        that.$set(list, "cart_num", 1);
-      }
-      that.carnum();
-      that.countMoney();
-      that.syncCartNum(list);
-    },
-    syncCartNum(cart) {
-      if (!cart.sync) {
-        changeCartNum(cart.id, Math.max(cart.cartNum, 1) || 1)
-          .then(res => {
-            this.getCartList();
-            this.gainCount();
-          })
-          .catch(error => {
-            this.gainCount();
-            uni.showToast({
-              title: error.response.data.msg,
-              icon: "none",
-              duration: 2000
+        that.carnum();
+        that.countMoney();
+        that.syncCartNum(list);
+      },
+      syncCartNum(cart) {
+        if (!cart.sync) {
+          changeCartNum(cart.id, Math.max(cart.cartNum, 1) || 1)
+            .then(res => {
+              this.getCartList();
+              this.gainCount();
+            })
+            .catch(error => {
+              this.gainCount();
+              uni.showToast({
+                title: error.response.data.msg,
+                icon: "none",
+                duration: 2000
+              });
             });
-          });
-      }
-    },
-    //单选
-    switchSelect: function(index) {
-      let that = this,
-        cart = that.cartList.valid[index],
-        i = this.checkedIds.indexOf(cart.id);
-      cart.checked = !cart.checked;
+        }
+      },
+      //单选
+      switchSelect: function (index) {
+        let that = this,
+          cart = that.cartList.valid[index],
+          i = this.checkedIds.indexOf(cart.id);
+        cart.checked = !cart.checked;
 
-      if (i !== -1) this.checkedIds.splice(i, 1);
-      if (cart.checked) {
-        this.checkedIds.push(cart.id);
-      }
-      let len = that.cartList.valid.length;
-      let selectnum = [];
-      for (let i = 0; i < len; i++) {
-        if (that.cartList.valid[i].checked === true) {
-          selectnum.push(true);
+        if (i !== -1) this.checkedIds.splice(i, 1);
+        if (cart.checked) {
+          this.checkedIds.push(cart.id);
         }
-      }
-      that.isAllSelect = selectnum.length === len;
-      that.$set(that, "cartList", that.cartList);
-      that.$set(that, "isAllSelect", that.isAllSelect);
-      cookie.set(CHECKED_IDS, that.checkedIds);
-      that.carnum();
-      that.gainCount();
-      that.countMoney();
-    },
-    //全选
-    allChecked: function(e) {
-      console.log(e);
-      let that = this;
-      let selectAllStatus = e.mp.detail.value[0] == "allSelect" ? true : false;
-      console.log(selectAllStatus);
-      // let selectAllStatus = that.isAllSelect;
-      let checkedIds = [];
-      // for (let i = 0; i < array.length; i++) {
-      //   array[i].checked = selectAllStatus;
-      //   checked.push()
-      // }
-      that.cartList.valid.forEach(cart => {
-        cart.checked = selectAllStatus;
-        if (selectAllStatus) {
-          checkedIds.push(cart.id);
+        let len = that.cartList.valid.length;
+        let selectnum = [];
+        for (let i = 0; i < len; i++) {
+          if (that.cartList.valid[i].checked === true) {
+            selectnum.push(true);
+          }
         }
-      });
-      let cartList = {
-        ...that.cartList
-      };
-      that.cartList = [];
-      that.cartList = cartList;
-      console.log(this.cartList);
-      this.$set(this, "cartList", this.cartList);
-      this.$set(this, "isAllSelect", selectAllStatus);
-      this.checkedIds = checkedIds;
-      cookie.set(CHECKED_IDS, checkedIds);
-      that.carnum();
-      that.countMoney();
-      this.$forceUpdate();
-    },
-    //数量
-    carnum: function() {
-      let that = this;
-      var carnum = 0;
-      var array = that.cartList.valid;
-      for (let i = 0; i < array.length; i++) {
-        if (array[i].checked === true) {
-          carnum += parseInt(array[i].cartNum);
+        that.isAllSelect = selectnum.length === len;
+        that.$set(that, "cartList", that.cartList);
+        that.$set(that, "isAllSelect", that.isAllSelect);
+        cookie.set(CHECKED_IDS, that.checkedIds);
+        that.carnum();
+        that.gainCount();
+        that.countMoney();
+      },
+      //全选
+      allChecked: function (e) {
+        console.log(e);
+        let that = this;
+        let selectAllStatus = e.mp.detail.value[0] == "allSelect" ? true : false;
+        console.log(selectAllStatus);
+        // let selectAllStatus = that.isAllSelect;
+        let checkedIds = [];
+        // for (let i = 0; i < array.length; i++) {
+        //   array[i].checked = selectAllStatus;
+        //   checked.push()
+        // }
+        that.cartList.valid.forEach(cart => {
+          cart.checked = selectAllStatus;
+          if (selectAllStatus) {
+            checkedIds.push(cart.id);
+          }
+        });
+        let cartList = {
+          ...that.cartList
+        };
+        that.cartList = [];
+        that.cartList = cartList;
+        console.log(this.cartList);
+        this.$set(this, "cartList", this.cartList);
+        this.$set(this, "isAllSelect", selectAllStatus);
+        this.checkedIds = checkedIds;
+        cookie.set(CHECKED_IDS, checkedIds);
+        that.carnum();
+        that.countMoney();
+        this.$forceUpdate();
+      },
+      //数量
+      carnum: function () {
+        let that = this;
+        var carnum = 0;
+        var array = that.cartList.valid;
+        for (let i = 0; i < array.length; i++) {
+          if (array[i].checked === true) {
+            carnum += parseInt(array[i].cartNum);
+          }
         }
-      }
-      that.$set(that, "cartCount", carnum);
-    },
-    //总共价钱；
-    countMoney: function() {
-      let that = this;
-      let carmoney = 0;
-      let array = that.cartList.valid;
-      for (let i = 0; i < array.length; i++) {
-        if (array[i].checked === true) {
-          carmoney = add(carmoney, mul(array[i].cartNum, array[i].truePrice));
+        that.$set(that, "cartCount", carnum);
+      },
+      //总共价钱；
+      countMoney: function () {
+        let that = this;
+        let carmoney = 0;
+        let array = that.cartList.valid;
+        for (let i = 0; i < array.length; i++) {
+          if (array[i].checked === true) {
+            carmoney = add(carmoney, mul(array[i].cartNum, array[i].truePrice));
+          }
         }
+        that.countmoney = carmoney;
       }
-      that.countmoney = carmoney;
     }
-  }
-};
+  };
 </script>
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index 013c7cf..32402eb 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -133,7 +133,7 @@
         :login_type="userInfo.login_type"
       ></SwitchWindow>-->
     </view>
-    <Authorization v-if="!$store.getters.token" />
+    <Authorization v-else />
   </view>
 </template>
 <script>
@@ -185,7 +185,7 @@
           }
         });
       },
-      goBindPhone(){
+      goBindPhone() {
         this.$yrouter.push({
           path: "/pages/user/BindingPhone/index",
         });
diff --git a/剩余问题.js b/剩余问题.js
index 6fd88ea..69e7f7a 100644
--- a/剩余问题.js
+++ b/剩余问题.js
@@ -5,7 +5,7 @@
 // ? 未测试出该问题 
 
 // 页面都多了一个头部
-// ~~延后处理 
+// ~~ 需要打包h5的时候单独修改配置 
 
 // 6、评价图片上传不了
 // ？接口报错，反馈给老徐了 
@@ -14,10 +14,10 @@
 // ？接口报错，反馈给老徐了 
 
 // 12、h5分享关系没形成，看下你那登陆怎么处理的参考下以前的h5
-// ~~ 延后处理
+// ？前端功能修改完，后台交给老徐了
 
 // 13、海报分享，分享分享调整没问题，因为是首页，但是，商品详情海报，拼团海报，砍价海报路由跳转会有问题
-// ？商品拼团海报生成的不是小程序码
+// ？前端功能修改完，后台交给老徐了
 // 海报相关页面
 // components/StorePoster.vue 商品详情
 // >  根据用户来源生成二维码