app 收款喇叭

ghsApp/src/admin/billing/affirm.vue

@@ -114,7 +114,7 @@
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" >
             <view v-if="form.hasPay == 2" class="tui-title">应收金额</view>
             <view v-else class="tui-title">实收金额</view>
-            <input style="border:1upx solid #eee;color:#3385FF;width:150upx;height:70upx;" type="number" @focus="modifyPrice=''" v-model="modifyPrice" placeholder-class="tui-placeholder"/>
+            <input style="border:1upx solid #eee;color:#3385FF;width:150upx;height:70upx;" type="digit" @focus="modifyPrice=''" v-model="modifyPrice" placeholder-class="tui-placeholder"/>
             <text v-if="modifyPrice > 0 && modifyPrice > finalPrice" style="font-size:25upx;margin-left:20upx;color:red;">人工资材费 ¥{{parseFloat((modifyPrice-finalPrice).toFixed(2))}}</text>
             <text v-if="modifyPrice > 0 && modifyPrice < finalPrice" style="font-size:25upx;margin-left:20upx;color:green;">优惠 ¥{{parseFloat((finalPrice-modifyPrice).toFixed(2))}}</text>
           </tui-list-cell>

ghsApp/src/admin/custom/selectCustom.vue

@@ -21,8 +21,8 @@
                   <text v-else-if="item.level == 0" style="color:#999;">{{ item.levelName }}</text>
                   <text v-else>{{ item.levelName }}</text>
                 </span>
-                <span v-if="item.debtAmount > 0" class="debt-amount">欠款<span class="amount_num">{{parseFloat(item.debtAmount)}}</span></span>
-                <button v-if="selectStyle == 1" class="admin-button-com mini default" style="margin-left:50upx;" @click.stop="pdaKd(item)">PDA</button>
+                <span v-if="item.debtAmount > 0" class="debt-amount">欠<span class="amount_num">{{parseFloat(item.debtAmount)}}</span></span>
+                <button v-if="selectStyle == 1 && couldScan == true" class="admin-button-com mini default" style="margin-left:30upx;" @click.stop="pdaKd(item)">扫码开单</button>
               </div>
             </div>
           </div>
@@ -55,7 +55,8 @@ export default {
     AppWrapperEmpty,
     appVipModule,
     AppTag,
-    AppSearchModule
+    AppSearchModule,
+    couldScan:false
   },
   mixins: [list],
   data() {
@@ -79,7 +80,16 @@ export default {
       uni.stopPullDownRefresh();
     }
   },
-  onLoad(option) {},
+  onLoad(option) {
+    // #ifdef APP-PLUS
+    if(plus.device.vendor == 'SUNMI'){
+      this.couldScan = true
+    }
+    if(plus.device.vendor == 'Newland'){
+      this.couldScan = true
+    }
+    // #endif
+  },
 	onShow(){
 		uni.removeStorageSync('newClient');
 	},
@@ -253,6 +263,7 @@ export default {
   }
 
   .tui-msg-content {
+    width:500upx;
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
@@ -260,10 +271,10 @@ export default {
     line-height: 1;
     color: #9397a4;
     .debt-amount{
-      margin-left:20upx;
+      margin-left:10upx;
       .amount_num{
         color:red;
-        margin-left:10upx;
+        margin-left:5upx;
       }
     }
   }

ghsApp/src/admin/home/me.vue

@@ -92,6 +92,10 @@
               <div class="tui-title">打印机设置</div>
             </tui-list-cell>
 
+            <tui-list-cell @click="pageTo({ url: '/admin/shop/trumpet' })" class="line-cell" :hover="false" :arrow="true">
+              <div class="tui-title">云喇叭设置</div>
+            </tui-list-cell>
+
             <tui-list-cell @click="getCustomService()" class="line-cell" :hover="false" :arrow="true">
               <div class="tui-title">联系我们</div>
             </tui-list-cell>

ghsApp/src/admin/item/components/ItemStock.vue

@@ -20,7 +20,9 @@
 	</view>
 	<text class="bottom-button" @click.stop="goToOrderDetail(info.id)">销售记录</text>
 	<text class="bottom-button" @click.stop="goToStockDetail(info.id)">库存明细</text>
+	<!-- #ifdef MP-WEIXIN -->
 	<text class="bottom-button" @click.stop="goToProduct(info.id)">分享</text>
+	<!-- #endif -->
 	<text class="bottom-button" @click.stop="moreToDo(info)">更多</text>
 </view>
 </template>

ghsApp/src/admin/item/list.vue

@@ -169,7 +169,8 @@ export default {
 		},
 		itemMore(){
 			let that=this;
-			let doList = ['下载全部条码', '打印全部条码']
+			//let doList = ['下载全部条码', '打印全部条码']
+			let doList = ['下载全部条码']
 			uni.showActionSheet({
 				itemList: doList,
 				success: function (respond) {
@@ -179,7 +180,7 @@ export default {
 						that.downBarcodeTable()
 					}
 					if(index == 1){
-						that.printAllBarCode()
+						//that.printAllBarCode()
 					}
 				}
 			})

ghsApp/src/api/shop/index.js

@@ -56,6 +56,16 @@ export const getPrint = data => {
 	return https.get('/shop-ext/get-print', data)
 }
 
+//添加云喇叭
+export const addCloudLb = data => {
+	return https.get('/shop-ext/add-lb', data)
+}
+
+//获取云喇叭信息
+export const getLb = data => {
+	return https.get('/shop-ext/get-lb', data)
+}
+
 export const getPtGhsShop = data => {
 	return https.get('/shop/get-pt-ghs-shop', data)
 }

ghsApp/src/pages.json

@@ -139,6 +139,7 @@
 				{"path": "list","style": {"navigationBarTitleText": "店铺管理"}},
 				{"path": "add","style": {"navigationBarTitleText": ""}},
 				{"path": "print","style": {"navigationBarTitleText": "云打印"}},
+				{"path": "trumpet","style": {"navigationBarTitleText": "云喇叭设置"}},
 				{"path": "changeShop","style": {"navigationBarTitleText": "切换门店"}},
 				{"path": "sk","style": {"navigationBarTitleText": "零售店设置"}}
 			]