Merge branch 'master' of git.huaml.com:zhh/front-end

ghsApp/src/admin/home/components/OrderItem.vue

@@ -2,9 +2,9 @@
     <view  @click="pageTo({url:'/pagesOrder/detail',query: {id: item.id}})">
         <view class="order-top_box" style="position:relative;">
 
-        <!-- <image style="width:105upx;position:absolute;top:80upx;right:12upx;" v-if="item.status == 1"
+        <image style="width:105upx;position:absolute;top:80upx;right:12upx;" v-if="item.status == 1 && isScanEnv"
         @click.stop="pageTo({url:'/admin/billing/toPay',query: {orderId:item.id,orderSn:item.orderSn,actPrice:item.actPrice}})"
-         mode="widthFix" :src="`${constant.imgUrl}/icon/codePay8.png`"></image> -->
+         mode="widthFix" :src="`${constant.imgUrl}/icon/codePay8.png`"></image>
 
         <image style="width: 38upx;height:38upx;border-radius:38upx;" mode="aspectFit" :src="item.customAvatarUrl"></image>
           <view class="tit"> {{ item.customName || "" }}</view>
@@ -59,10 +59,13 @@ export default {
 	components: {
 	},
 	props: {
-
-        item: {
+	    item: {
 			required: true
-		}
+		},
+	    isScanEnv:{
+			type: Boolean,
+			default: false
+	    }
 	},
 	data() {
 		return {

ghsApp/src/admin/home/order.vue

@@ -20,7 +20,7 @@
       <block v-if="!$util.isEmpty(list.data)">
         <div class="list" v-for="(item, index) in list.data" :key="index">
 
-          <OrderItem :item="item" @orderEventBtn="orderEventBtn"></OrderItem>
+          <OrderItem :item="item" :isScanEnv="isScanEnv" @orderEventBtn="orderEventBtn"></OrderItem>
 
         </div>
       </block>
@@ -65,6 +65,7 @@ export default {
   computed: { ...mapGetters(["getLoginInfo", "getDictionariesInfo"]) },
   data() {
     return {
+      isScanEnv:false,
     	orderId:'',
       seekVal: "",
       isShow: false, //是否显选择时间段
@@ -137,6 +138,13 @@ export default {
       this.tabIndex = parseInt(tabIndex.tabIndex);
     }
     this._list();
+
+    // #ifdef APP-PLUS
+    if(this.$util.isScanEnv()){
+      this.isScanEnv = true
+    }
+	//#endif
+
   },
   onShow() {