H5-购物车：清空加弹窗确认

htmldev/dashboard/src/assets/js/date.js

@@ -1,23 +0,0 @@
-export function formatDate(date, fmt) {
-	if (/(y+)/.test(fmt)) {
-		fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
-	}
-	let o = {
-		'M+': date.getMonth() + 1,
-		'd+': date.getDate(),
-		'h+': date.getHours(),
-		'm+': date.getMinutes(),
-		's+': date.getSeconds()
-	};
-	for (let k in o) {
-		if (new RegExp(`(${k})`).test(fmt)) {
-			let str = o[k] + '';
-			fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : padLeftZero(str));
-		}
-	}
-	return fmt;
-};
-
-function padLeftZero(str) {
-	return ('00' + str).substr(str.length);
-}

htmldev/dashboard/src/assets/js/store.js

@@ -1,27 +0,0 @@
-export function saveToLocal(id, key, value) {
-	let seller = window.localStorage.__seller__;
-	if (!seller) {
-		seller = {};
-		seller[id] = {};
-	} else {
-		seller = JSON.parse(seller);
-		if (!seller[id]) {
-			seller[id] = {};
-		}
-	}
-	seller[id][key] = value;
-	window.localStorage.__seller__ = JSON.stringify(seller);
-};
-
-export function loadFromLocal(id, key, def) {
-	let seller = window.localStorage.__seller__;
-	if (!seller) {
-		return def;
-	}
-	seller = JSON.parse(seller)[id];
-	if (!seller) {
-		return def;
-	}
-	let ret = seller[key];
-	return ret || def;
-};

htmldev/dashboard/src/assets/js/util.js

@@ -1,21 +0,0 @@
-/**
- * 解析url参数
- * @example ?id=12345&a=b
- * @return Object {id:12345,a:b}
- */
-export function urlParse() {
-  let url = window.location.search;
-  let obj = {};
-  let reg = /[?&][^?&]+=[^?&]+/g;
-  let arr = url.match(reg);
-  // ['?id=12345', '&a=b']
-  if (arr) {
-    arr.forEach((item) => {
-      let tempArr = item.substring(1).split('=');
-      let key = decodeURIComponent(tempArr[0]);
-      let val = decodeURIComponent(tempArr[1]);
-      obj[key] = val;
-    });
-  }
-  return obj;
-};

htmldev/dashboard/src/login/index.vue

@@ -181,6 +181,7 @@ export default {
             message: '登录成功',
             forbidClick: true,
             onClose: () => {
+              // todo bug 登录成功不跳转
               const { nextUrl } = this.$route.query
               if (/\//.test(nextUrl)) {
                 this.$router.replace({ path: nextUrl })

htmldev/dashboard/src/views/sell/shopcart/shopcart.vue

@@ -111,7 +111,7 @@
 <script type="text/ecmascript-6">
 import BScroll from 'better-scroll'
 import cartcontrol from '../cartcontrol/cartcontrol'
-import { Toast } from 'vant'
+import { Toast, Dialog } from 'vant'
 import { mapGetters } from 'vuex'
 import { apiCartList, apiCartClear, apiCartUpdate } from '../goods/api'
 
@@ -141,10 +141,9 @@ export default {
       selectFoods: [],
       pagenum: 1,
       pagesize: 20,
-      numFetchStatus: 0,
+      numFetchStatus: 0, // 购物车列表加载状态
       arrFetchStatus: ['正在努力加载～', '到底了'],
-      booFetchData: false,
-      finished: false
+      booFetchData: false // 页面第一次获取数据是否成功
     }
   },
   computed: {
@@ -202,7 +201,6 @@ export default {
       this.pagesize = 20
       this.numFetchStatus = 0
       this.booFetchData = false
-      this.finished = false
 
       this.$nextTick(() => {
         this.fetchCartList()
@@ -210,7 +208,7 @@ export default {
     },
     async fetchCartList () {
       const { id } = this.objCurrentBarInfo
-      if (this.finished) {
+      if (this.numFetchStatus === 1) {
         return
       }
       try {
@@ -222,7 +220,7 @@ export default {
           if (Array.isArray(list)) {
             this.selectFoods = this.selectFoods.concat(list)
             if (list.length <= 0) {
-              this.finished = true
+              this.numFetchStatus = 1
             }
             this.$nextTick(() => {
               if (!this.scroll) {
@@ -271,20 +269,26 @@ export default {
     /*
     * 清空购物车
     * */
-    async empty () {
+    empty () {
+      const vm = this
       const { id } = this.objCurrentBarInfo
-
-      this.selectFoods.forEach((food) => {
-        food.product_num = 0
+      Dialog.confirm({
+        message: '清空购物车？'
+      }).then(async () => {
+        vm.selectFoods.forEach((food) => {
+          food.product_num = 0
+        })
+        try {
+          const { status, msg } = await apiCartClear(id)
+          if (status) {
+            vm.init()
+          } else {
+            Toast(msg)
+          }
+        } catch (err) {}
+      }).catch(() => {
+        // on cancel
       })
-      try {
-        const { status, msg } = await apiCartClear(id)
-        if (status) {
-          this.init()
-        } else {
-          Toast(msg)
-        }
-      } catch (err) {}
     },
     pay () {
       if (this.totalPrice < 1) {
@@ -340,7 +344,8 @@ export default {
       }
     },
     dropping (el, done) {
-      // const rf = el.offsetHeight
+      /* eslint-disable no-unused-vars */
+      const rf = el.offsetHeight
       this.$nextTick(() => {
         el.style.webkitTransform = 'translate3d(0,0,0)'
         el.style.transform = 'translate3d(0,0,0)'