打印

ghs/src/views/in/change.vue

@@ -51,21 +51,21 @@
                 </el-table-column>
             </el-table>
             <div style="text-align:left;margin-top:18px;">
-                <el-button @click="goBackFn" plain v-if="info.status != 3">返回</el-button>
-				<el-button @click="goBackFn" plain v-else>稍后入库</el-button>
-
-                <el-button v-if="info.status == 3" type="success" @click="savePrice">保存价格，稍后入库</el-button>
-                <el-button v-if="info.status == 3" type="danger" @click="confirmIn">仅入库不改价</el-button>
-                <el-button v-if="info.status != 3" type="primary" @click="commitChange(2)">确认改价</el-button>
                 <el-button v-if="info.status == 3" type="primary" @click="commitChange(1)">改价并入库</el-button>
+                <el-button v-if="info.status != 3" type="primary" @click="commitChange(2)">确认改价</el-button>
+				<el-button v-if="info.status == 3" type="danger" @click="confirmIn">仅入库不改价</el-button>
+                <el-button v-if="info.status == 3" type="success" @click="savePrice">保存价格，稍后入库</el-button>
+
 
 
-				<el-button type="primary" @click="printOrder()" style="margin-left:100px;" v-if="info.status != 5">打小票</el-button>
+				<el-button type="primary" @click="printOrder()" v-if="info.status != 5">打小票</el-button>
 				<el-button disabled v-else>打小票</el-button>
 
-				<el-button type="primary" @click="printPaper()" style="margin-left:100px;" v-if="info.status != 5">打多联</el-button>
+				<el-button type="primary" @click="printPaper()" v-if="info.status != 5">打多联</el-button>
 				<el-button disabled v-else>打多联</el-button>
 
+				<el-button @click="goBackFn" plain>返回</el-button>
+
             </div>
         </div>
 	</div>
@@ -122,9 +122,6 @@ export default {
 					//uni.hideLoading()
                     if(data.status == 4){
                         that.$notify({ title: '成功', message: '操作成功', type: 'success'})
-                        setTimeout(function(){
-                            that.goBackBefore()
-                        },1100)
                     }
 				})
 			})
@@ -163,9 +160,6 @@ export default {
                 this.$service.purchaseOrderItem.saveCgPrice({data:JSON.stringify(newProduct),cgId:targetId}).then(data => {
 					//uni.hideLoading()
                     that.$notify({ title: '成功', message: '操作成功', type: 'success'})
-                    setTimeout(function(){
-                        that.goBackBefore()
-                    },1300)
 				})
 			})
 		},
@@ -218,9 +212,6 @@ export default {
             that.$service.product.batchChangePrice({data:JSON.stringify(newProduct),changeType:'cg',targetId:targetId,appVersion:1}).then(data => {
 				//uni.hideLoading()
                 that.$notify({ title: '成功', message: '操作成功', type: 'success'})
-                setTimeout(function(){
-                    that.goBackBefore()
-                },1800)
 			})
 		},
         goBackBefore(){

ghsApp/src/config.js

@@ -1,4 +1,4 @@
 export const ProjectName = 'ghs'
-export const APIHOST = 'https://api.shop.wixhb.com'
-export const IMGHOST = 'https://img.wixhb.com'
-export const CURRENT_ENV = 'production'
+export const APIHOST = 'https://api.shop.hzghd.com'
+export const IMGHOST = 'https://img.hzghd.com'
+export const CURRENT_ENV = 'dev'

ghsApp/src/manifest.json

@@ -62,7 +62,7 @@
                     "entitlements" : {
                         "com.apple.developer.associated-domains" : [ "applinks:fronttg.wixhb.com" ]
                     }
-                }
+                }          
             },
             /* SDK配置 */
             "sdkConfigs" : {
@@ -172,19 +172,20 @@
     "quickapp" : {},
     /* 小程序特有相关 线上（销花宝） wxcf32b3f0684c2433 开发（花掌柜） wx21b7c3ef12082099 */
     "mp-weixin" : {
-        "appid" : "wxcf32b3f0684c2433",
+        "appid" : "wx21b7c3ef12082099",
         "setting" : {
             "urlCheck" : false
         },
-        "optimization" : {
-            "subPackages" : true
-        },
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
                 "desc" : "请点击确定"
             }
-        }
+        },
+        "optimization" : {
+            "subPackages" : true
+        },
+        "lazyCodeLoading":"requiredComponents"
     },
     "mp-alipay" : {
         "usingComponents" : true
@@ -213,7 +214,7 @@
             "port" : 81,
             "proxy" : {
                 "/api" : {
-                    "target" : "http://api.shop.wixhb.com",
+                    "target" : "http://api.shop.hzghd.com",
                     "secure" : false,
                     "changeOrigin" : true,
                     "pathRewrite" : {