Merge branch '2.0.1' of http://git.ycjcjy.com/SpaceOfCheng/wechat into 2.0.1

src/pages/sales/salesGiveOutDetail/index.vue

@@ -28,7 +28,7 @@
                   </div>
                   <div class="flex-item">
                     <div>
-                      <span>￥{{item.Price}} * 1</span>
+                      <span>￥{{item.Price}} * {{item.Number}}</span>
                     </div>
                   </div>
                   <span>{{toolClass.dateFormat(item.CreateDate, 'yyyy/MM/dd hh:mm')}}</span>

src/pages/user/App.vue

@@ -6,16 +6,13 @@
 
 <script>
 import '../../common/css/reset.css'
-import logo from '../../common/icon/indexlogo.jpg'
-import wxsdk from '../../util/share'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: actions } = createNamespacedHelpers('userCenter')
 export default {
   name: 'app',
   data () {
     return {
-      showPage: false,
-      logo
+      showPage: false
     }
   },
   components: {},
@@ -34,12 +31,6 @@ export default {
     this.getUserInfo({ org: this.org, code: this.code }).then(() => {
       this.showPage = true
     })
-    // wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
-    //   title: '城的空间',
-    //   desc: '城的空间',
-    //   link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
-    //   thu_image: `https://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/citymini%2Findexlogo.jpg`
-    // })
   },
   methods: {
     ...actions(['getUserInfo'])

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

@@ -3,14 +3,14 @@
     <div class="top">
       <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer.RealName ? userInfo.customer.RealName : userInfo.customer.Name" @selectCase="showVanPicker"></topCaseInfo>
     </div>
-    <nav class="flex-h" v-if="userInfo.customer.MapUser !== ''">
+    <nav class="flex-h" v-if="userInfo.customer.MapUser !== '' && fromPage === 'sales'">
       <a class="flex-item" v-for="(item,index) in cutNavList" :key="index" v-if="userInfo.customer.UserTypeId !== 'manager' || item.id !== '4'" :class="{'active': navActive === index}" @click="cutNav(index)">{{item.value}}</a>
     </nav>
       <div class="content">
         <div>
           <ul>
             <li :hidden="navActive !== 0 && userInfo.customer.MapUser !== ''" class="placeOrder">
-              <div class="topInfo flex-h" v-if="userInfo.customer.MapUser !== ''">
+              <div class="topInfo flex-h" v-if="userInfo.customer.MapUser !== '' && fromPage === 'sales'">
                 <div class="flex-item">
                   <div>
                     <span>共计已使用：{{caseTotal.total}}杯</span>
@@ -146,6 +146,7 @@ export default {
   name: '',
   data () {
     return {
+      fromPage: '',
       myRecommendUserList: [],
       forbidList: [],
       postCustomerData: {
@@ -247,6 +248,7 @@ export default {
     }),
     ...mapCaseState({
       caseTotal: x => x.caseTotal,
+      choosedCase: x => x.choosedCase
     }),
     ...mapCardState({
       cardList: x => x.cardList
@@ -260,7 +262,8 @@ export default {
     noMore
   },
   created () {
-    if (!this.userInfo.customer.MapUser) {
+    this.fromPage = sessionStorage.getItem('from')
+    if (!this.userInfo.customer.MapUser || (this.userInfo.customer.MapUser && this.fromPage !== 'sales')) {
       this.topCaseInfoData.ShowSelect = true
     }
     if (this.userInfo.customer.MapUser !== '') {
@@ -365,6 +368,7 @@ export default {
     ...mapCaseActions([
       'getCaseTotal',
       'getCaseConf',
+      'changeChoosedCase'
     ]),
     ...mapCardActions(['getCardList']),
     checkCanDo () {
@@ -413,6 +417,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 +503,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) {
@@ -545,7 +564,7 @@ export default {
     toOrders (subItem, item) {
       const _that = this
       this.getCaseConf({ caseid: subItem.CaseId }).then(res => {
-        if (this.checkCanOrder()) {
+        if (this.checkCanOrder() && sessionStorage.getItem('from') === 'sales') {
           _that.$toast('您的点单功能已被关闭！')
           return
         }

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/mainPage/userCenter/index.vue

@@ -86,6 +86,8 @@ export default {
       this.user = this.userInfo.customer
       if (this.user.AccountInfo) {
         this.AccountInfo = JSON.parse(this.user.AccountInfo)
+
+        
       }
       this.headimgurl = this.user.Headimgurl
     })
@@ -109,7 +111,7 @@ export default {
       this.$router.push({ name: 'bindMobile' })
     },
     toGoodsOrder () {
-      this.$router.push({ name: 'orderList' })
+      this.$router.push({ name: 'orderList', query: { from: 'c' } })
     },
     toBodyCheck () {
       var url = window.location.pathname

src/pages/user/majorProjects/index.vue

@@ -7,7 +7,7 @@
             <img :src='item.CaseImageUrl' class="cover" alt="">
           </swiper-slide>
         </swiper> -->
-        <img :src="projectInfo.CmsCaseImgs[0].CaseImageUrl" alt="">
+        <img :src="cover" alt="" class="cover">
       </div>
     </div>
     <p>{{projectInfo.DetailContent}}</p>
@@ -69,6 +69,7 @@ export default {
       },
       courseList: [], // 课程列表
       initList: [],
+      cover:''
     }
   },
   computed: {
@@ -141,6 +142,8 @@ export default {
             endDate: new Date(res.Courses[n].EndDate).getTime(),
           })
         }
+        this.cover = res.CmsCaseImgs.filter(item => item.ImageType === 'cover')[0].CaseImageUrl
+        console.log(this.cover)
         console.log(aArr)
         this.initList = aArr
         this.calcArr()

src/pages/user/orderList/index.vue

@@ -79,6 +79,7 @@ export default {
     this.getCustomerGoodsOrder({
       page: this.page,
       pagesize: this.pagesize,
+      from: this.$route.query.from || ''
     }).then((res) => {
       // console.log(JSON.stringify(res))
       if(res.list === null){

src/pages/user/placeOrder/index.vue

@@ -16,7 +16,7 @@
         <div class="flex-item">
           <div>
             <span>桌号：{{tableNo}}</span>
-            <span v-if="userInfo.customer.MapUser !== ''">本月已用：{{caseTotal.monthtotal}}杯</span>
+            <span v-if="userInfo.customer.MapUser !== '' && fromPage === 'sales'">本月已用：{{caseTotal.monthtotal}}杯</span>
           </div>
         </div>
         <a @click="reback">返回选择桌号</a>
@@ -185,6 +185,7 @@ export default {
     calcMenu,
   },
   created () {
+    this.fromPage = sessionStorage.getItem('from')
     this.getGoodsTypeList({
       caseid: this.caseId,
     }).then((res) => {
@@ -213,7 +214,7 @@ export default {
     ]),
     toPlaceOrder () { // 下单 
       if (this.selGoods.length) {
-        if (this.userInfo.customer.MapUser === '') {
+        if (this.userInfo.customer.MapUser === '' || (this.userInfo.customer.MapUser !== '' && sessionStorage.getItem('from') !== 'sales')) {
           this.$router.push({ name: 'placeOrderDetail', query: { info: JSON.stringify(this.selGoods), caseid: encodeURI(this.caseId), areaid: encodeURI(this.areaId), areaname: encodeURI(this.areaName), areaid: encodeURI(this.areaId), tableid: encodeURI(this.tableId), tableno: encodeURI(this.tableNo) } })
         } else {
           this.showCalcMenu = true
@@ -275,13 +276,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 +306,8 @@ export default {
         this.toPay({
           info: JSON.stringify(this.postData.info),
           detail: JSON.stringify(this.postData.detail),
-          coupon: JSON.stringify(this.postData.coupon)
+          customercouponid: '',
+          from: this.postData.from
         }).then((res) => {
           this.ajaxOff = true
           this.showCalcMenu = false
@@ -315,6 +318,8 @@ export default {
           // }).then(() => {
 
           // })
+        }).catch(() => {
+          this.ajaxoff = true
         })
       }
     },

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({
@@ -246,7 +247,7 @@ export default {
           //   window.history.go(-2)
           // })
         }).catch(() => {
-          // this.ajaxoff = true
+          this.ajaxoff = true
         })
       }
     },

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
   }
 }