Merge branch 'old' of https://gitea.lihaink.cn/mkm/nk-shop2.0 into old

manifest.json

@@ -31,7 +31,8 @@
             "UniMP" : {
                 "description" : "uni小程序"
             },
-            "Maps" : {}
+            "Maps" : {},
+            "Push" : {}
         },
         "safearea" : {
             "bottom" : {
@@ -120,7 +121,8 @@
                     }
                 },
                 "oauth" : {},
-                "ad" : {}
+                "ad" : {},
+                "push" : {}
             },
             "icons" : {
                 "android" : {
@@ -161,7 +163,7 @@
         "nativePlugins" : {
             "JG-JCore" : {
                 "JPUSH_APPKEY_IOS" : "8a5efd65cda14fafa6e64ad3",
-                "JPUSH_CHANNEL_IOS" : "",
+                "JPUSH_CHANNEL_IOS" : "8a5efd65cda14fafa6e64ad3",
                 "JPUSH_APPKEY_ANDROID" : "b5f679f4357018605ea6fd2e",
                 "JPUSH_CHANNEL_ANDROID" : "",
                 "__plugin_info__" : {

pages/margin/margin.vue

@@ -118,11 +118,7 @@
 			},
 			//缴纳保证金
 			paydecimal() {
-				if (this.merchant_Data.is_margin != 1) {
+			
-					this.$util.Tips({
-						title: '暂时无需缴纳保证金'
-					});
-				} else {
 					let that = this
 					uni.showModal({
 						title: '提示',
@@ -154,6 +150,9 @@
 									});
 								}).catch((err) => {
 									console.log(err)
+									this.$util.Tips(()=>{
+										
+									})
 								})
 							} else if (res.cancel) {
 								console.log('用户点击取消');
@@ -163,7 +162,6 @@
 
 				}
 
-			},
 		}
 	}
 </script>

pages/moreProject/moreProject.vue

@@ -39,11 +39,11 @@
 								<image class="icon_img" :src="`${prefix}zsgl.png`" mode="aspectFill"></image>
 								<text class="text">在售管理</text>
 							</view>
-							<view class="examine"
+							<!-- <view class="examine"
 								@click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&product_type=98&type_id=${userInfoData.mer_info.type_id}`)">
 								<image class="icon_img" :src="`${prefix}cwgl.png`" mode="aspectFill"></image>
 								<text class="text">财务管理</text>
-							</view>
+							</view> -->
 							<!-- 	<view class="examine"
 							@click="navigator(`/pages/admin/financial_management/index?mer_id=${mer_id}&product_type=98&type_id=${userInfoData.mer_info.type_id}`)">
 							<image class="icon_img" :src="`${prefix}cwgl.png`" mode="aspectFill"></image>
@@ -60,6 +60,7 @@
 								</image>
 								<text class="text">入库管理</text>
 							</view>
+							
 							<view class="examine"
 								@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}&product_type=98`, '商户设置')">
 								<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill"></image>
@@ -203,8 +204,12 @@
 									</image>
 									<text class="text">缴纳保证金</text>
 								</view>
-
+								<view class="examine"
-							<!-- 	<view class="examine"
+									@click="navigator(`/pages/admin/financial_management/index?mer_id=${mer_id}&product_type=98&type_id=${userInfoData.mer_info.type_id}`)">
+									<image class="icon_img" :src="`${prefix}cwgl.png`" mode="aspectFill"></image>
+									<text class="text">财务管理</text>
+								</view>
+								<!-- 	<view class="examine"
 									@click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
 									<image class="icon_img" src="@/static/images/diaohuo.png" mode="aspectFill">
 									</image>
@@ -631,7 +636,7 @@
 		created() {},
 		onLoad() {
 			this.Fheight = uni.getSystemInfoSync().windowHeight + 'px';
-this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight+45;
+			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 45;
 		},
 		onShow() {
 			if (this.isLogin) {

pages/plant_release/index.vue

@@ -130,7 +130,7 @@
 				selHeight="250upx">
 			</avatar>
 			<!-- 提到的宝贝弹窗 -->
-			<uni-popup ref="associated" type="bottom">
+			<uni-popup ref="associated" type="bottom" style="z-index: 9999;">
 				<associated @close="close" @getProduct="getProduct" :checkedObj="productList"></associated>
 			</uni-popup>
 			<!-- 话题弹窗 -->

pages/short_video/appSwiper/index.nvue

@@ -309,7 +309,7 @@
 			</view>
 		</uni-popup>
 		<!-- 他提到的宝贝弹窗 -->
-		<uni-popup type="bottom" ref="pinglunMentioned"  style="background-color: rebeccapurple;">
+		<uni-popup type="bottom" ref="pinglunMentioned" >
 		
 		
 				<mentioned ref="mentioned" @close="closePopup" :list="moreList" :uid="authorUid" ></mentioned>
@@ -718,12 +718,14 @@
 				// 					});
 				// 				})'
 				// that.isUser ?
+				
 				videoList({
 					page: that.page,
 					limit: that.limit,
 					id: this.videoID
 
 				}).then(res => {
+					console.log(res.data,'1')
 					that.getVideoData(res.data.list);
 				})
 
@@ -899,7 +901,7 @@
 				deoList(this.videoID).then(async (res) => {
 					this.loadVideo = false
 					this.userUid = res.data.uid
-					this.page = this.page + 1;
+					this.page = 1;
 					var msg = [res.data];
 					for (let i = 0; i < msg.length; i++) {
 						msg[i]['isMore'] = false

pages/users/payment/payment.vue

@@ -272,11 +272,16 @@
 									icon: 'none',
 									title: res.message
 								})
-								setTimeout(() => {
+								if(res.data.status='error'){
-									uni.navigateTo({
+									
-										url:'/pages/users/order_list/index?status=2'
+								}else{
+									setTimeout(() => {
+									uni.navigateBack({
+										delta: 2
 									})
-								}, 1000)
+									}, 1000)
+								}
+					
 							}
 
 						}