修复勾股部分bug

pages.json

@@ -100,14 +100,17 @@
         "navigationBarTitleText": "商品管理",
         "navigationStyle": "custom"
       }
-		},{
+    }, {
-            "path" : "pages/margin/margin",
+      "path": "pages/margin/margin",
-            "style" :                                                                                    
+      "style": {
-            {
         "navigationBarTitleText": "缴纳保证金",
         "enablePullDownRefresh": false
       }
-            
+    }, {
+      "path": "pages/order_pay_status/index",
+      "style": {
+        "navigationBarTitleText": "支付状态"
+      }
     }
     // {
     // 	"path": "pages/gather/gather",
@@ -163,12 +166,7 @@
     // 		"navigationBarTitleText": "加载中"
     // 	}
     // },
-		// {
+
-		// 	"path": "pages/order_pay_status/index",
-		// 	"style": {
-		// 		"navigationBarTitleText": "支付状态"
-		// 	}
-		// },
     // {
     // 	"path": "pages/error/index",
     // 	"style": {

pages/index/index.vue

@@ -4,7 +4,7 @@
 		<view class="content-top">
 			<view class="content-tops">
 				<view class="content-top_img" v-if="Object.keys(userInfoData).length>0">
-					<image :src="userInfoData.avatar" v-if="userInfoData.avatar" mode="aspectFill" @click="logout">
+					<image :src="userInfoData.mer_info.mer_avatar" v-if="userInfoData.mer_info&&userInfoData.mer_info.mer_avatar" mode="aspectFill" @click="logout">
 					</image>
 					<image src="@/static/images/f.png" v-else mode="aspectFit" @click="logout"></image>
 				</view>
@@ -874,7 +874,7 @@ import {
 			 */
 			getUserInfo() {
 				getUserInfo().then(res => {
-
+          // console.log(res);
 					this.userid = res.data.uid
 					this.userInfoData = res.data
 					this.merchantData.phone = res.data.phone

pages/nongKe/supply_chain/supplierA.vue

@@ -305,8 +305,7 @@
 		},
 		data() {
 			return {
-
+				titName: "",
-				titName: "坝坝宴",
 				price: 0,
 				stock: 0,
 				nows: false,
@@ -380,6 +379,9 @@
 			};
 		},
 		onLoad(options) {
+      if (options.tit) {
+      	options.tit == 1 ? this.titName = "先款后货" : this.titName = "先货后款"
+      }else this.titName = "坝坝宴";
 			this.product_type = options.product_type ?? 0
 			if (options.street_id != undefined) {
 				this.sotreParam.street_id = options.street_id
@@ -407,9 +409,6 @@
 					return
 				}
 				this.titName = this.menuList[index].category_name
-
-
-
 				// console.log(this.menuList)
 			})
 			// console.log(this.menuList)

pages/order_pay_status/index.vue

@@ -224,11 +224,11 @@
 				if (this.product_type == 98) {
 					if(val==1){
 						uni.navigateTo({
-							url: `/pages/users/order_list/indexCopy?status=1&product_type=${this.product_type}`
+							url: `/pages/users/order_list/indexCopy?status=2&product_type=${this.product_type}`
 						})
 						}else{
 							uni.navigateTo({
-								url: `/pages/users/order_list/indexCopy?status=0&product_type=${this.product_type}`
+								url: `/pages/users/order_list/indexCopy?status=1&product_type=${this.product_type}`
 							})
 						}
 					

pages/product/basicSet.vue

@@ -10,7 +10,7 @@
 					<!-- 				<u--image :showLoading="true" :src="images[0].img" width="388px" height="210.53rpx" radius="4px"
 											@click="delImg(0)" mode="aspectFit"></u--image> -->
 					<u--image :showLoading="true" :src="images[0].img" width="360px" height="210.53rpx" radius="4px"
-						@click="delImg(2)"></u--image>
+						@click="delImg(0)"></u--image>
 				</block>
 				<view v-else class="upload" @click="seleckImage(0)">
 					<view class="iconfont icon-tupian1"></view>
@@ -165,7 +165,7 @@
 
 		</view>
 
-		<button class="submit_btn l_center" @click="postMerchantUpdata">提交审核</button>
+		<button class="submit_btn l_center" @click="postMerchantUpdata">提交</button>
 
 		<u-datetime-picker :show="beginTimeShow" v-model="mer_take_time[0]" mode="time" @close="beginTimeShow = false"
 			:closeOnClickOverlay="true" @cancel="beginTimeShow = false"

pages/users/order_confirm/index.vue

@@ -1213,6 +1213,7 @@
 			payment: function(data) {
 				let that = this;
 				createOrder(data).then(res => {
+          console.log('测试', res);
 					let status = res.data.status,
 						orderId = res.data.result.order_id,
 						callback_key = res.data.result.pay_key,

utils/util.js

@@ -110,6 +110,9 @@ export default {
 						setTimeout(function() {
 							uni.redirectTo({
 								url: url,
+                fail(err) {
+                  console.log("跳转失败", err);
+                }
 							})
 						}, endtime);
 						break;