订单信息

ghsPad/src/api/order/index.js

@@ -5,7 +5,7 @@ export const cancelOrderFn = data => {
 };
 
 export const onlinePrintOrder = data => {
-	return https.get("/order/print-order", data);
+	return https.get("/order/cloud-print-order", data);
 };
 
 export const getList = data => {

ghsPad/src/pages/home/components/orderInfo.vue

@@ -37,46 +37,32 @@
 
       <view class="unit-use-item">
         <view class="commodity-list">
-          <view v-for="(s, idx) in orderInfo.itemInfoList" :key="idx" class="commodity-item" >
-            <image class="item-icon" :src="s.smallCover" @click="pageTo({url:'/admin/item/detail',query:{id: s.id}})"></image>
+          <view v-for="(s, idx) in orderInfo.product" :key="idx" class="commodity-item" >
+            <image class="item-icon" :src="s.cover" @click="pageTo({url:'/admin/item/detail',query:{id: s.id}})"></image>
             <view class="item-info">
               <view class="info-line">
                 <text class="item-name">{{ s.name }}</text>
                 <text class="item-price">
-                  <text class="unit">{{s.num}}{{s.unitName}}</text>
+                  <text class="unit">{{s.xhNum}}{{s.xhUnitName}}</text>
                 </text>
               </view>
               <view class="info-line">
-                <text class="item-type"></text>
-              </view>
-            </view>
-          </view>
-
-          <view v-for="(s, idx) in orderInfo.goodsInfoList" :key="idx" class="commodity-item" >
-            <image class="item-icon" :src="s.smallCover" @click="pageTo({url:'/admin/item/detail',query:{id: s.id}})"></image>
-            <view class="item-info">
-              <view class="info-line">
-                <text class="item-name">{{ s.name }}</text>
-                <text class="item-price">
-                  <text class="unit">{{s.num}}份</text>
+                <text class="item-type">
+                  <text v-if="Number(s.refundNum)>0" style="margin-right:8upx;">已退{{s.refundNum}}{{s.xhUnitName}}</text>
+                  <text v-if="Number(s.giveNum)>0">赠送{{s.giveNum}}{{s.giveNum}}{{s.xhUnitName}}</text>
                 </text>
               </view>
-              <view class="info-line">
-                <text class="item-type"></text>
-              </view>
             </view>
           </view>
-
         </view>
       </view>
 
     </view>
 
     <view class="button-area">
-      <view :class="[orderInfo.status==1 || orderInfo.status==5 ? '' : 'active']" @click="printFn(orderInfo)">打印</view>
-      <view :class="[orderInfo.status==1 ? 'active' : '']" @click="selectFn(orderInfo,0)">查微信</view>
+      <view :class="[orderInfo.status==1 || orderInfo.status==5 ? '' : 'active']" @click="printFn(orderInfo)">打印({{orderInfo.printNum}})</view>
       <view :class="[orderInfo.status==1 ? 'active' : '']" @click="cancelShow()">取消</view>
-      <view class="active" @click="openRetail()">零售</view>
+      <view class="active" @click="upgradeApp()">更新</view>
     </view>
 
     <!-- 选数量金额 -->
@@ -97,6 +83,10 @@
         <uni-popup-dialog type="info" cancelText="取消" confirmText="确认" title="提示" content="确认完成？" @confirm="confirmFinish"></uni-popup-dialog>
     </uni-popup>
 
+    <uni-popup ref="printOrderRef" type="dialog">
+        <uni-popup-dialog type="info" cancelText="取消" confirmText="确认" title="提示" content="请检查是否发过货，确认补打？" @confirm="confirmPrint"></uni-popup-dialog>
+    </uni-popup>
+
   </view>
 </view>
 </template>
@@ -160,34 +150,10 @@ export default {
 
 	},
   methods:{
-		openRetail(){
-			let type = uni.getSystemInfoSync().platform
-			if(type == 'android'){
-				if (plus.runtime.isApplicationExist({pname: 'huahuibao.hzgsy'})) {
-					let senddata = {}
-					//调用第三方app
-					plus.runtime.launchApplication({
-							pname: "huahuibao.hzgsy",
-							extra: senddata
-						},
-						(e)=> {
-							uni.showToast({ title: "打开失败", icon: "none" })
-						},
-					);
-				} else {
-					uni.showModal({
-						title: '提示',
-						content: '没有安装，请先下载安装',
-						success: function (res){
-						if (res.confirm){ 
-							plus.runtime.openURL('http://www.wixhb.com/main/app')
-						}
-						}
-					})
-				}
-			}else{
-				this.$msg('暂不支持打开')
-			}
+		upgradeApp(){
+      // #ifdef APP-PLUS
+      plus.runtime.openURL('http://www.wixhb.com/main/app')
+      // #endif
 		},
     confirmLock(){
 
@@ -205,8 +171,20 @@ export default {
 
     },
     printFn(item){
+			let that = this
+			if(item.printNum && Number(item.printNum)>0){
+				this.$refs.printOrderRef.open()
+				return false
+			}
+			that.beginPrint(item)
+    },
+    confirmPrint(){
+      this.beginPrint(this.orderInfo)
+    },
+    beginPrint(item){
       onlinePrintOrder({id:item.id}).then(res=>{
         if(res.code == 1){
+          item.printNum++
           this.$msg('操作成功')
         }
       })
@@ -257,22 +235,6 @@ export default {
           },1500)
         }
       })
-    },
-    selectFn(order,payWay){
-      let that = this
-      uni.showLoading({mask:true})
-      codePayCheck({id:order.id,payWay:payWay,recheck:1}).then(res=>{
-          if(res.code == 1){
-              if(res.data.returnStatus == 'SUCCESS'){
-                  that.$msg('订单已付款')
-                  setTimeout(function(){
-                      that.getOrderDetail(order.id)
-                  },1500)
-              }else{
-                that.$msg('订单未付款！！')
-              }
-          }
-      })
     }
   }
 }
@@ -392,10 +354,12 @@ export default {
                 overflow: hidden;
                 white-space: nowrap;
                 text-overflow: ellipsis;
+                font-weight:bold;
               }
               .item-price {
                 color: #333;
                 font-size: 10upx;
+                font-weight:bold;
               }
               .item-type {
                 color: #999;
@@ -465,10 +429,12 @@ export default {
                 overflow: hidden;
                 white-space: nowrap;
                 text-overflow: ellipsis;
+                font-weight:bold;
               }
               .item-price {
                 color: #333;
                 font-size: 10upx;
+                font-weight:bold;
               }
               .item-type {
                 color: #999;