lilei il y a 3 ans
Parent
commit
2054d3c904
6 fichiers modifiés avec 34 ajouts et 11 suppressions
  1. 1 1
      App.vue
  2. 2 2
      config/index.js
  3. 6 3
      libs/axios.js
  4. 13 0
      package-lock.json
  5. 3 2
      pages/common/commonModal.vue
  6. 9 3
      pages/replenishmentManage/scanCodePrint.vue

+ 1 - 1
App.vue

@@ -4,7 +4,7 @@
 			baseUrl: '',
 			token: '',
 			version: '', // 当前版本号
-			buildType: 'dev', // 打包环境对应类型,pro 生产 uat 预发布 dev 本地开发
+			buildType: 'uat', // 打包环境对应类型,pro 生产 uat 预发布 dev 本地开发
 			envTips: '', // 环境文字提示
 			theme: 'default', // 主题,default
 			isIphoneXup: false //是否iphonex以及以上的版本

+ 2 - 2
config/index.js

@@ -4,8 +4,8 @@ const getConfig = (theme) => {
 		// 默认主题
 		"default":{
 			themePath: 'default',
-			pro_URL: 'https://car.zyucgj.com/saas/clz/', // 生产地址
-			uat_URL: 'http://md.test.zyucgj.com/saas/clz/', // 预发布地址
+			pro_URL: 'https://iscm.360arrow.com/qpls-md/', // 生产地址
+			uat_URL: 'http://p.iscm.360arrow.com/qpls-md/', // 预发布地址
 			// dev_URL: 'http://192.168.16.107:7300/mock/61aad8ea5688cb3878d81e39/qpls-md/', // 本地地址
 			dev_URL: 'http://frps.chelingzhu.com:7800/qpls-md/', // 本地地址
 			appName: 'iSCM智慧供应链', // app 名称

+ 6 - 3
libs/axios.js

@@ -22,7 +22,7 @@ const request = (opts, hasToken) => {
 		method: opts.method,
 		header: opts.header ? opts.header : header
 	}
-	console.log(DefaultOpts)
+	// console.log(DefaultOpts)
 	let promise = new Promise(function(resolve, reject) {
 		uni.request(DefaultOpts).then(
 			(res) => {
@@ -43,7 +43,6 @@ const request = (opts, hasToken) => {
 				}else if(res[1].status){
 					ret = res[1]
 				}
-				console.log(ret)
 				if(ret.status == '200'){
 					resolve(ret)
 				}else{
@@ -63,8 +62,12 @@ const request = (opts, hasToken) => {
 						}
 					}
 					else{
+						console.log(opts.url,'opts.url')
 						if(ret.status == 500){
-							if(opts.url.indexOf("store/validateStoreAndDevice")<0&&opts.url.indexOf("couponReceives/findUsableCoupon")<0){
+							if(
+							opts.url.indexOf("store/validateStoreAndDevice")<0&&
+							opts.url.indexOf("couponReceives/findUsableCoupon")<0&&
+							opts.url.indexOf("shelfReplenish/detail/queryByProductQrCode")<0){
 								uni.showToast({
 									icon:'none',
 									title: ret.message,

+ 13 - 0
package-lock.json

@@ -0,0 +1,13 @@
+{
+  "name": "qpls-md-app",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "uview-ui": {
+      "version": "1.8.4",
+      "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.8.4.tgz",
+      "integrity": "sha512-Zr+D5dFdNy6CdHQLBEXeGq/w0LkjxzBtsgaaDwLl0P58g67H7fBBDvy6AzWK/k0c7dwPYMBiK7I4Tr9p92+0DA=="
+    }
+  }
+}

+ 3 - 2
pages/common/commonModal.vue

@@ -65,16 +65,17 @@
 	}
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 	.commonModal{
 		width: 100%;
 		height: 100%;
 		position: absolute;
 		left: 0;
 		top: 0;
+		z-index: 10000;
 		.modal-con{
 			width: 70%;
-			margin: 50% auto 0;
+			margin: 40vh auto 0;
 			background-color: #fff;
 			border-radius: 24upx;
 			.modal-title{

+ 9 - 3
pages/replenishmentManage/scanCodePrint.vue

@@ -8,7 +8,7 @@
 			</view>
 		</view>
 		<!-- 确认弹框 -->
-		<common-modal v-if="confirmModal" :openModal="confirmModal" title="扫码失败" content="确认对该数字货架进行补货吗?" confirmText="好的" :isCancel="false" @confirm="modalConfirm" @close="confirmModal=false" />
+		<common-modal v-if="confirmModal" :openModal="confirmModal" title="扫码失败" content="抱歉,该产品不是此补货单的产品请更换产品重新扫描?" confirmText="好的" :isCancel="false" @confirm="modalConfirm" @close="confirmModal=false" />
 	</view>
 </template>
 
@@ -31,7 +31,7 @@
 			this.init()
 		},
 		onLoad(options) {
-			this.replenishBillSn = options.replenishBillSn
+			this.replenishBillSn = options.sn
 			this.getPartList()
 		},
 		methods: {
@@ -44,6 +44,7 @@
 							item.confirmQty = item.confirmQty ? Number(item.confirmQty) : 0
 						})
 						this.partList = res.data || []
+						console.log(this.partList,'this.partList')
 					}else{
 						this.partList = []
 					}
@@ -52,12 +53,16 @@
 			// 扫码结果
 			scanResult(qrCode){
 				const _this = this
+				console.log(qrCode)
+				uni.showLoading({
+					title: "正在查询产品信息"
+				})
 				shelfReplenishQrCode({
 					qrCode: qrCode,
 					replenishBillSn: this.replenishBillSn
 				}).then(res => {
+					console.log(res)
 					if(res.status == 200){
-						_this.toashMsg("扫码成功!")
 						uni.navigateTo({ url: "/pages/common/printTag/printTag?sn="+item.replenishBillSn })
 					}else{
 						this.confirmModal = true
@@ -70,6 +75,7 @@
 						// 	}
 						// })
 					}
+					uni.hideLoading()
 				})
 			},
 			modalConfirm(){