1.1.8-add stadium_id in sku search

app/build.gradle

@@ -8,8 +8,8 @@ android {
         minSdkVersion 21
         targetSdkVersion 28 //建议此属性值设为21 io.dcloud.PandoraEntry 作为apk入口时   必须设置 targetSDKVersion>=21 沉浸式才生效
 
-        versionCode 116
-        versionName "1.1.6"
+        versionCode 118
+        versionName "1.1.8"
         multiDexEnabled true
         ndk {
 //            abiFilters 'x86','armeabi-v7a'

app/src/main/assets/apps/__UNI__3B4D40B/www/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__3B4D40B","name":"欧轩收银端","version":{"name":"1.1.7","code":117},"description":"","developer":{"name":"","email":"","url":""},"permissions":{"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"3.99","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"launch_path":"__uniappview.html"}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__3B4D40B","name":"欧轩收银端","version":{"name":"1.1.8","code":118},"description":"","developer":{"name":"","email":"","url":""},"permissions":{"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"3.99","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"launch_path":"__uniappview.html"}

uniapp_project_code/src/components/index/keyboard/input_box_QR.vue

@@ -99,7 +99,7 @@
 
 		let {brand_id,stadium_id,token} = util.getPostParams()
 		let urlParams = {
-			brand_id,token,
+			brand_id,token,stadium_id,
 			"sku": sku,
 		}
 		console.log("searchGoodBySku urlParams:", urlParams)

uniapp_project_code/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "欧轩收银端",
     "appid" : "__UNI__3B4D40B",
     "description" : "",
-    "versionName" : "1.1.7",
-    "versionCode" : 117,
+    "versionName" : "1.1.8",
+    "versionCode" : 118,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

uniapp_project_code/src/pages/index/index.vue

@@ -140,6 +140,7 @@
 				// 	// console.log("skulist:", this.shopList)
 				// })
 				this.setFooterHeight()
+				// this.setTestSku() //在页面加载后，直接进行sku测试
 			}, 1000)
 		},
 		methods: {
@@ -147,7 +148,7 @@
 				util.showLoad()
 				let {brand_id,stadium_id,token} = util.getPostParams()
 				let urlParams = {
-					brand_id,token,
+					brand_id,token,stadium_id,
 					"sku": sku,
 				}
 				console.log("searchGoodBySku urlParams:", urlParams)
@@ -190,7 +191,7 @@
 			},
 			async setTestSku() {
 				console.log("Test set SKU 10000012")
-				let skulist = await this.searchGoodBySku("10000012")
+				let skulist = await this.searchGoodBySku("6934024512123")
 				this.shopList = this.shopList.concat(skulist)
 			},
 			async clickToPay() {
@@ -386,7 +387,7 @@
 					return res
 				}).catch(err => {
 					console.log("searchGoodBySku err: ", err)
-					util.showNone("未找到商品")
+					util.showNone(err.res.data?.message||"未找到商品-i")
 				})
 				//将skulist合并到shopList
 				if(skulist&&skulist.length>0)this.shopList = this.combinedList(this.shopList, skulist)

uniapp_project_code/src/pages/index/standby.vue

@@ -83,7 +83,7 @@ export default {
     },
     async onReady() {
         // this.screenHeight = await util.getPageHeight()
-        console.log(`the index page onReady----` + this.screenHeight)
+        console.log(`the index page onReady----` + this.screenHeight,uni.getStorage("stadiumInfo"))
         app = getApp();
         setTimeout(async () => {
             // await this.updateGoodsList().then(async () => {
@@ -100,7 +100,7 @@ export default {
         searchGoodBySku: async (sku) => {
             let {brand_id,stadium_id,token} = util.getPostParams()
             let urlParams = {
-                brand_id,token,
+                brand_id,token,stadium_id,
                 "sku": sku,
             }
             console.log("searchGoodBySku urlParams:", urlParams)
@@ -174,7 +174,8 @@ export default {
                 // return skulist
             }).catch(err => {
                 console.log("searchGoodBySku err: ", err)
-                util.showNone("未找到商品")
+                // util.showNone("未找到商品")
+				util.showNone(err.res.data?.message||"未找到商品-s")
             })
             //将skulist合并到shopList
             // this.shopList = this.combinedList(this.shopList, skulist)