H5-商品购买:商品详情

htmldev/dashboard/src/api/request.js

@@ -50,7 +50,12 @@ request.interceptors.response.use(response => {
     Vue.cookie.delete('afhousewechatToken')
     location.replace(url)
   } else if (code === 403) {
-    router.push('/login')
+    router.replace({
+      path: '/login',
+      query: {
+        nextUrl: router.currentRoute.fullPath
+      }
+    })
   }
   return response.data
 }, (error) => {

htmldev/dashboard/src/login/index.vue

@@ -187,7 +187,12 @@ export default {
             message: '登录成功',
             forbidClick: true,
             onClose: () => {
-              this.$router.go(-1)
+              const { nextUrl } = this.$route.query
+              if (/\//.test(nextUrl)) {
+                this.$router.replace({ path: nextUrl })
+              } else {
+                this.$router.go(-1)
+              }
             }
           })
           return

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

@@ -28,7 +28,8 @@
               <span
                 v-for="(item, index) in food.product_skus"
                 :key="index"
-                :class="{'active': index === 0}">{{ item.product_sku }}</span>
+                :class="{'active': SKUId === item.id}"
+                @click="selectSKU(item.id)">{{ item.product_sku }}</span>
             </p>
           </div>
           <div
@@ -41,8 +42,10 @@
             </div>
             <p class="options">
               <span
+                :key="idx"
                 v-for="(attr, idx) in item.attach_content"
-                :key="idx">{{ attr }}</span>
+                :class="{'active': Array.isArray(objProductAttachs[SKUId]) && Array.isArray(objProductAttachs[SKUId][index]) && objProductAttachs[SKUId][index].findIndex(attachName => attachName === attr) > -1}"
+                @click="selectAttach(SKUId, index, attr, item.attach_max_num)">{{ attr }}</span>
             </p>
           </div>
           <div class="detail">
@@ -76,8 +79,6 @@ import Vue from 'vue'
 import cartcontrol from '../cartcontrol/cartcontrol'
 import { Icon } from 'vant'
 
-const ALL = 2
-
 export default {
   props: {
     food: {
@@ -87,21 +88,23 @@ export default {
   data () {
     return {
       showFlag: false,
-      selectType: ALL,
-      onlyContent: true,
-      desc: {
-        all: '全部',
-        positive: '推荐',
-        negative: '吐槽'
-      }
+      SKUId: '', // 商品skuID
+      objProductAttachs: {} // 商品附加
     }
   },
   methods: {
     show () {
+      this.SKUId = ''
+      this.objProductAttachs = {}
       this.showFlag = true
-      this.selectType = ALL
-      this.onlyContent = true
       this.$nextTick(() => {
+        const skus = this.food.product_skus
+        const attachs = this.food.product_attachs
+        this.SKUId = skus[0].id
+        skus.forEach(SKU => {
+          this.objProductAttachs[SKU.id] = attachs.map(() => [])
+        })
+
         if (!this.scroll) {
           this.scroll = new BScroll(this.$refs.food, {
             click: true
@@ -121,29 +124,42 @@ export default {
       this.$emit('add', event.target)
       Vue.set(this.food, 'count', 1)
     },
-    needShow (type, text) {
-      if (this.onlyContent && !text) {
-        return false
-      }
-      if (this.selectType === ALL) {
-        return true
-      } else {
-        return type === this.selectType
-      }
-    },
     addFood (target) {
       this.$emit('add', target)
     },
-    selectRating (type) {
-      this.selectType = type
-      this.$nextTick(() => {
-        this.scroll.refresh()
-      })
+    /**
+     * 选择SKU
+     * @param id SKU ID
+     */
+    selectSKU (id) {
+      this.SKUId = id
     },
-    toggleContent () {
-      this.onlyContent = !this.onlyContent
+    /**
+     * 选择商品附加
+     * @param SKUId SKU ID
+     * @param index 附加列表下标
+     * @param attachName 附加名
+     * @param max 当前附加做多可选值
+     */
+    selectAttach (SKUId, index, attachName, max) {
+      // 刷新SKUId，不然数据更新不生效
+      this.SKUId = ''
       this.$nextTick(() => {
-        this.scroll.refresh()
+        this.SKUId = SKUId
+        const allAttach = JSON.parse(JSON.stringify(this.objProductAttachs[SKUId]))
+        // 当前选择的附加
+        const curAttach = allAttach[index]
+        const idx = curAttach.findIndex(item => item === attachName)
+
+        if (idx > -1) {
+          curAttach.splice(index, 1)
+        } else {
+          if (curAttach.length < max) {
+            curAttach.push(attachName)
+          }
+        }
+        allAttach.splice(index, 1, curAttach)
+        Vue.set(this.objProductAttachs, SKUId, allAttach)
       })
     }
   },

htmldev/dashboard/src/views/sell/goods/index.vue

@@ -1,7 +1,8 @@
 <template>
   <div>
+    <!--todo 临时隐藏-->
     <aflogo
-      :objCurrentBarInfo="objCurrentBarInfo"/>
+      :objCurrentBarInfo="objCurrentBarInfo" style="visibility: hidden;"/>
     <div class="goods">
       <div
         ref="menuWrapper"
@@ -105,7 +106,7 @@ import { mapGetters } from 'vuex'
 import { Toast, Button } from 'vant'
 
 const mockDataJson = require('../../../mock/data.json')
-
+// todo 登录成功不会掉接口
 export default {
   data () {
     return {