新增扫码功能

ghsApp/src/admin/billing/affirm.vue

@@ -227,6 +227,8 @@
 
 		</uni-popup>
 
+		<view v-if="getMyShopInfo && getMyShopInfo.scan == 1" @click="beginScan()" style="width:120upx;height:120upx;position:fixed;bottom:150upx;right:30upx;background-color:#3385FF;color:white;border-radius:60upx;text-align:center;line-height:120upx;">扫码</view>
+
     </view>
   </view>
 </template>
@@ -382,7 +384,7 @@ export default {
       uni.$off('listenGetScanCode')
 	},
   computed: {
-    ...mapGetters(["getMerchantInfo", "getLoginInfo"]),
+    ...mapGetters(["getMerchantInfo","getMyShopInfo", "getLoginInfo"]),
     displayPackCost(){
       if(this.currentShop.pfLevel && this.currentShop.pfLevel == 1){
         return true
@@ -431,6 +433,16 @@ export default {
   },
   methods: {
     ...mapActions(["initMerchantInfo"]),
+    beginScan(){
+      console.log('beginScan')
+      let that = this
+      uni.scanCode({
+        scanType: ['barCode'],
+        success: function (res) {
+          that.takeItem(res.result)
+        }
+      })
+    },
     changeGet(){
       this.calc = this.calc == 'add' ? 'sub' : 'add'
     },

ghsApp/src/admin/custom/selectCustom.vue

@@ -10,7 +10,7 @@
         <tui-list-cell :arrow="true" @click="selectCurrent(item)">
           <div class="tui-msg-box">
             <img :src="item.avatar" class="tui-msg-pic" mode="widthFix" />
-            <div class="tui-msg-item">
+            <div class="tui-msg-item" style="position:relative;">
               <div class="tui-msg-name">
                 <div class="tui-user-name">
                   {{ item.name }}
@@ -22,6 +22,8 @@
                 <span>{{ item.visitTime.substr(5,11) }}</span>
                 <span v-if="item.debtAmount > 0" class="debt-amount">欠款<span class="amount_num">{{parseFloat(item.debtAmount)}}</span></span>
               </div>
+<image :src="`${constant.imgUrl}/icon/scan/scan.png`" mode="widthFix" @click.stop="selectCurrent(item,1)" v-if="getMyShopInfo && getMyShopInfo.scan == 1"
+style="position:absolute;right:0upx;top:20upx;width:60upx;"></image>
             </div>
           </div>
           <div class="tui-msg-right">
@@ -44,6 +46,7 @@ import AppTag from "@/components/module/app-tag.vue";
 import AppSearchModule from "@/components/module/app-search";
 import { list } from "@/mixins";
 import { getList } from "@/api/member";
+import { mapGetters } from "vuex";
 export default {
   name: "selectCustom",
   components: {
@@ -62,6 +65,9 @@ export default {
       selectStyle:1
     };
   },
+  computed:{
+    ...mapGetters(["getMyShopInfo"]),
+  },
   onPullDownRefresh() {
     this.resetList();
     this._list().then((res) => {
@@ -91,12 +97,12 @@ export default {
     pdaKd(custom){
       this.$util.pageTo({url: '/admin/billing/affirm',type:2,query:{customId:custom.id,kdType:'SCAN'}})
     },
-    selectCurrent(item){
+    selectCurrent(item,scanEnv=0){
       let style = this.option.style ? this.option.style : 1
       this.selectStyle = style
       if(style == 1){
         //选择客户并开单情况
-        if(this.$util.isScanEnv()){
+        if(this.$util.isScanEnv() || scanEnv == 1){
           this.$util.pageTo({url: '/admin/billing/affirm',type:2,query: {customId: item.id,customName:item.name}})
         }else{
           this.$util.pageTo({url: '/admin/billing/index',type:2,query: {customId: item.id,customName:item.name}})

ghsApp/src/mixins/product.js

@@ -463,20 +463,20 @@ export default {
 
 		},
 		listenScanItem(){
+			let that = this
 			// #ifdef APP-PLUS
 			//避免重复，每次进来先移除全局自定义事件监听器
 			uni.$off('listenGetScanCode')
-			let that = this
 			uni.$on('listenGetScanCode',function(data){
 				that.takeItem(data.code)
 			})
+			// #endif
 			allProduct().then(res=>{
 				if(res.code == 1){
 					that.globalAllProduct = res.data.list
 					console.log('载入最新花材...')
 				}
 			})
-			// #endif
     	},
 		takeItem(code){
 			if(this.$util.isEmpty(code)){