123456

pages.json

@@ -126,6 +126,9 @@
 				// #ifdef MP
 				"navigationStyle": "custom",
 				// #endif
+				//#ifdef H5
+				"navigationStyle":"default",
+				//#endif
 				// #ifndef MP
 				"app-plus": {
 					"titleNView": {
@@ -342,6 +345,9 @@
 			"path": "pages/category/category",
 			"style": {
 				"navigationBarTitleText": "分类",
+				//#ifdef H5
+				"navigationStyle":"default",
+				//#endif
 				"app-plus": {
 					"bounce": "none",
 					"titleNView": {
@@ -689,6 +695,9 @@
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#FFFFFF",
+		//#ifdef H5
+		"navigationStyle":"custom",
+		//#endif
 		"backgroundColor": "#f8f8f8"
 	},
 	"tabBar": {

pages/cart/cart.vue

@@ -503,6 +503,7 @@
 					position: absolute;
 					top: 0;
 					bottom: 0;
+					left: 52rpx;
 					margin: auto;
 					line-height: 1.5;
 					padding-left: 10rpx;

pages/merchant/storeData.vue

@@ -108,6 +108,7 @@ export default {
 			console.log(this.now_date);
 			this.loadingType = 'more';
 			this.page = 1;
+			this.dataList = []
 			this.loadData();
 		},
 		showInput() {

pages/merchant/storeQr.vue

@@ -90,7 +90,7 @@
 				this.uid = data.uid
 				
 			})
-			this.val = this.baseURL + '/index/pages/index/index?store_id=' + this.id + '&spread=' + this.uid
+			this.val = this.baseURL + '/index/#/pages/index/index?store_id=' + this.id + '&spread=' + this.uid
 			console.log(this.val )
 		},
 		methods: {

pages/received/index.vue

@@ -284,14 +284,17 @@ export default {
 		 * @param {Object} done
 		 * @param {Object} value
 		 */
-		confirm(done, value) {
-			// 输入框的值
+		confirm(done, value) {
+			console.log(done,value,"123456")
+			// 输入框的值
+			console.log(this.code,value,this.payType,'传参')
 			receivedPaymentCreate({
 				code: this.code,
 				amount: value,
 				type:this.payType
 			})
-				.then(({ data }) => {
+				.then(e => {
+					console.log(e,"123456")
 					uni.showModal({
 						title: '提示',
 						content: '成功',
@@ -434,11 +437,13 @@ export default {
 			uni.scanCode({
 				onlyFromCamera: true,
 				success: function(e) {
-					let result = JSON.parse(e.result);
-					uni.showModal({
-						title: '扫描二维码',
-						content: e.result
-					});
+					// let result = JSON.parse(e.result);
+					// uni.showModal({
+					// 	title: '扫描二维码',
+					// 	content: e.result
+					// });
+					obj.code = e.result;
+					obj.$refs.popup1.open();
 				}
 			});
 			// #endif
@@ -451,7 +456,8 @@ export default {
 				type: this.payType
 			})
 				.then(e => {
-					this.val = e.data.code;
+					this.val = e.data.code;
+					
 					console.log(e);
 				})
 				.catch(e => {