源花汇需求

ghsApp/src/admin/billing/affirm.vue

@@ -370,6 +370,11 @@ export default {
       }
     })
 
+    //源花汇开单默认不要打印小票
+    if(this.getLoginInfo.shopId == 10649){
+      this.form.needPrint = 2
+    }
+
 	},
 	onUnload(){
 			uni.removeStorageSync('newClient')

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

@@ -46,8 +46,8 @@
             </view>
         </view>
         <view v-if="item.sameTimeIdsNum && item.sameTimeIdsNum>1" style="text-align: center;color:white;
-        font-weight: bold;margin-top:20upx;font-size:30upx;background-color:red;padding-top:6upx;padding-bottom:6upx;"
-        @click="pageTo({url:'/admin/order/itemOrder?ids='+item.sameTimeIds})">
+        margin-top:20upx;font-size:32upx;background-color:#3385FF;padding-top:7upx;padding-bottom:7upx;"
+        @click.stop="pageTo({url:'/admin/order/itemOrder?ids='+item.sameTimeIds})">
           本地址下共有{{item.sameTimeIdsNum}}个订单，可合并发货
         </view>
         </view>

ghsApp/src/admin/home/order.vue

@@ -133,7 +133,8 @@ export default {
       searchTypeName:'客户',
       searchTime:'',
       startTime:'',
-      endTime:''
+      endTime:'',
+      fromDetail:{status:0}
     };
   },
   onPullDownRefresh() {
@@ -165,8 +166,13 @@ export default {
 	  //#endif
   },
   onShow() {
-    this.resetList()
-    this.init()
+    //从订单详情页过来则不需要刷新
+    if(this.fromDetail.status == 1){
+      this.fromDetail.status = 0
+    }else{
+      this.resetList()
+      this.init()
+    }
   },
   methods: {
     directFh(info){

ghsApp/src/pagesOrder/detail.vue

@@ -2,8 +2,11 @@
 	<view class="app-content">
 
 		<view v-if="!$util.isEmpty(detailInfo)" class="info-content_box">
-			<view class="title">
+			<view class="flex-space title">
 				客户
+				<view class="flex" style="color: #3385ff;font-weight:bold;font-size:32upx;">
+					<view @click="backBefore()" style="margin-left:50upx;">返回上级</view>
+				</view>
 			</view>
 			<view class="address-des_bx content-box" @click="copyCustom(detailInfo)">
 				<view>
@@ -414,6 +417,13 @@ export default {
 		}
 	},
 	methods: {
+		backBefore(){
+			//返回上一页带参数
+			let pages = getCurrentPages();
+			let prevPage = pages[ pages.length - 2 ];
+			prevPage.$vm.fromDetail = {status:1}
+			uni.navigateBack()
+		},
 		openAgain(){
 			this.$util.pageTo({
 				url: '/admin/billing/index?customId='+this.detailInfo.customId+'&customName='+this.detailInfo.customName,