2.0.1

src/pages/user/mainPage/coffeeIndex/index.vue

@@ -247,6 +247,7 @@ export default {
     }),
     ...mapCaseState({
       caseTotal: x => x.caseTotal,
+      choosedCase: x => x.choosedCase
     }),
     ...mapCardState({
       cardList: x => x.cardList
@@ -365,6 +366,7 @@ export default {
     ...mapCaseActions([
       'getCaseTotal',
       'getCaseConf',
+      'changeChoosedCase'
     ]),
     ...mapCardActions(['getCardList']),
     checkCanDo () {
@@ -413,6 +415,7 @@ export default {
         caseid: this.topCaseInfoData.caseId
       })
       this.showSelect = false
+      this.changeChoosedCase({ CaseName: val.CaseName, CaseId: val.CaseId })
     },
     cutNav (index) { // 切换nav
       this.navActive = index
@@ -498,41 +501,55 @@ export default {
           })
         }
       } else {
-        wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
-          title: '城的空间',
-          desc: '城的空间',
-          link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
-          thu_image: `https://spaceofcheng.oss-cn-beijing.aliyuncs.com/indexlogo.jpg?x-oss-process=style/wxicon`
-        }).then(() => {
-          wx.getLocation({
-            type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
-            success: function (res) {
-              let latitude1 = res.latitude // 纬度，浮点数，范围为90 ~ -90
-              let longitude1 = res.longitude // 经度，浮点数，范围为180 ~ -180。
-              for (let i = 0; i < that.CaseList.length; i++) {
-                let result = that.CaseList[i].Coordinate.split(",")
-                let latitude2 = parseFloat(result[0])
-                let longitude2 = parseFloat(result[1])
-                if (that.toolClass.getGreatCircleDistance(latitude1, longitude1, latitude2, longitude2) < 500) {
-                  that.topCaseInfoData.caseName = that.CaseList[i].CaseName
-                  that.topCaseInfoData.caseId = that.CaseList[i].CaseId
-                  that.getCaseTableList({
-                    caseid: that.topCaseInfoData.caseId
-                  })
-                  if (this.userInfo.customer.MapUser !== '') {
-                    that.getCaseTotal({
+        // console.log(this.choosedCase)
+        if (this.choosedCase.CaseId) {
+          that.topCaseInfoData.caseName = this.choosedCase.CaseName
+          that.topCaseInfoData.caseId = this.choosedCase.CaseId
+          // that.getCaseTableList({
+          //   caseid: that.topCaseInfoData.caseId
+          // })
+          // if (this.userInfo.customer.MapUser !== '') {
+          //   that.getCaseTotal({
+          //     caseid: that.topCaseInfoData.caseId
+          //   })
+          // }
+        } else {
+          wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
+            title: '城的空间',
+            desc: '城的空间',
+            link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
+            thu_image: `https://spaceofcheng.oss-cn-beijing.aliyuncs.com/indexlogo.jpg?x-oss-process=style/wxicon`
+          }).then(() => {
+            wx.getLocation({
+              type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
+              success: function (res) {
+                let latitude1 = res.latitude // 纬度，浮点数，范围为90 ~ -90
+                let longitude1 = res.longitude // 经度，浮点数，范围为180 ~ -180。
+                for (let i = 0; i < that.CaseList.length; i++) {
+                  let result = that.CaseList[i].Coordinate.split(",")
+                  let latitude2 = parseFloat(result[0])
+                  let longitude2 = parseFloat(result[1])
+                  if (that.toolClass.getGreatCircleDistance(latitude1, longitude1, latitude2, longitude2) < 500) {
+                    that.topCaseInfoData.caseName = that.CaseList[i].CaseName
+                    that.topCaseInfoData.caseId = that.CaseList[i].CaseId
+                    that.getCaseTableList({
                       caseid: that.topCaseInfoData.caseId
                     })
+                    if (this.userInfo.customer.MapUser !== '') {
+                      that.getCaseTotal({
+                        caseid: that.topCaseInfoData.caseId
+                      })
+                    }
                   }
                 }
+                if (!that.topCaseInfoData.caseId || !that.topCaseInfoData.caseName) {
+                  that.$toast('当前位置无案场')
+                  that.topCaseInfoData.caseName = '当前位置无案场'
+                }
               }
-              if (!that.topCaseInfoData.caseId || !that.topCaseInfoData.caseName) {
-                that.$toast('当前位置无案场')
-                that.topCaseInfoData.caseName = '当前位置无案场'
-              }
-            }
+            })
           })
-        })
+        }
       }
     },
     beforeClose (action, done) {

src/pages/user/mainPage/index.vue

@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState, mapActions } from 'vuex'
 export default {
   name: '',
   data () {
@@ -48,8 +48,9 @@ export default {
     if (!this.userInfo.customer.MapUser || !this.$route.query.hideTabbar) {
       this.showTabBar = true
     }
-  },
-  methods: {
+    if (this.$route.query.hideTabbar){
+      sessionStorage.setItem('from','sales')
+    }
   }
 }
 </script>

src/pages/user/placeOrder/index.vue

@@ -275,13 +275,14 @@ export default {
       })
     },
     placeOrder (Remark) { // 下单
-      if(this.ajaxOff){
+      if (this.ajaxOff) {
         this.ajaxOff = false
         this.postData.info.OrgId = this.orgId
         this.postData.info.UserId = this.userInfo.CustomerId
         this.postData.info.UserName = this.userInfo.customer.CustomerName
         this.postData.info.PayType = 'sys user'
         this.postData.info.Remark = Remark
+        this.postData.from = sessionStorage.getItem('from') ? sessionStorage.getItem('from') : ''
         var orderInfo = this.selGoods
         this.postData.detail = []
         var amount = 0
@@ -304,7 +305,8 @@ export default {
         this.toPay({
           info: JSON.stringify(this.postData.info),
           detail: JSON.stringify(this.postData.detail),
-          coupon: JSON.stringify(this.postData.coupon)
+          customercouponid: JSON.stringify(this.postData.coupon) || '',
+          from: this.postData.from
         }).then((res) => {
           this.ajaxOff = true
           this.showCalcMenu = false

src/pages/user/placeOrderDetail/index.vue

@@ -237,7 +237,8 @@ export default {
         this.toPay({
           info: JSON.stringify(this.postData.info),
           detail: JSON.stringify(this.postData.detail),
-          customercouponid: this.postData.customercouponid
+          customercouponid: this.postData.customercouponid || '',
+          from: ''
         }).then((res) => {
           this.showSuccessPopup = true
           // this.$dialog.alert({

src/store/case/case.js

@@ -7,6 +7,7 @@ export default {
   state: {
     caseTotal: {},
     caseConf: {},
+    choosedCase: {}
   },
   mutations: {
     setCaseTotal (state, data) { // 获取案场下单数量信息
@@ -15,6 +16,9 @@ export default {
     setCaseConf (state, data) { // 获取案场下单数量信息
       state.caseConf = data
     },
+    setChoosedCase (state, data) { // 获取案场下单数量信息
+      state.choosedCase = data
+    },
   },
   actions: {
     getCaseTotal ({ commit }, { caseid }) {
@@ -32,7 +36,7 @@ export default {
         })
       })
     },
-    getCaseConf ({ commit },{ caseid }) {
+    getCaseConf ({ commit }, { caseid }) {
       return new Promise((resolve, reject) => {
         Ajax(api.case.conf.url, {
           method: api.case.conf.method,
@@ -46,6 +50,9 @@ export default {
           reject(err)
         })
       })
+    },
+    changeChoosedCase ({ commit }, data) {
+      commit("setChoosedCase", data)
     }
   }
 }

src/store/placeOrderForCoffee/index.js

@@ -63,7 +63,7 @@ export default {
         })
       })
     },
-    toPay (context, { info, detail, customercouponid }) { // 下单
+    toPay (context, { info, detail, customercouponid, from }) { // 下单
       return new Promise((resolve, reject) => {
         Ajax(api.caseForCoffee.placeGoodsOrder.url, {
           method: api.caseForCoffee.placeGoodsOrder.method,
@@ -71,6 +71,7 @@ export default {
             info,
             detail,
             customercouponid,
+            from
           },
         }).then(res => {
           resolve(res)

vue.config.js

@@ -34,6 +34,7 @@ module.exports = {
       },
     },
     // compress: true,
+    devtool: 'source-map',
     disableHostCheck: true,   // That solved it
   }
 }