问题修复

api/user.js

@@ -21,6 +21,12 @@ export function postCreateApplyAPI(merId, data) {
 export function getAdminApplyAPI(merId, data) {
   return request.get(`admin/${merId}/apply`, data);
 }
+/**
+ * 提现记录
+ */
+export function getAdminApplyListAPI(merId) {
+  return request.get(`admin/${merId}/lis_apply`);
+}
 /**
  * 获取用户信息
  * 

config/app.js

@@ -12,7 +12,7 @@ if (process.env.NODE_ENV === "development") {
   httpApi = "https://crmeb-test.shop.lihaink.cn"
   // httpApi = "http://192.168.0.222"
   // #ifdef MP-WEIXIN
-  httpApiTwo = "http://cms.com"
+  httpApiTwo = "https://nk.lihaink.cn"
   httpApiThree = 'http://ceshi-oa.lihaink.cn'
   // #endif
   // #ifdef H5

pages/admin/cancellate_result/index.vue

@@ -159,8 +159,8 @@
 							title: res
 						});
 						setTimeout(()=>{
-							uni.navigateTo({
+							uni.navigateBack({
-								url: '/pages/admin/order_cancellation/index?mer_id='+that.mer_id
+								delta:1
 							});
 						},500)
 					})
@@ -205,8 +205,8 @@
 							title: res
 						});
 						setTimeout(()=>{
-							uni.navigateTo({
+							uni.navigateBack({
-								url: '/pages/admin/order_cancellation/index?mer_id='+that.mer_id
+								delta:1
 							});
 						},500)
 					});

pages/admin/order_cancellation/index.vue

@@ -71,6 +71,10 @@
 				this.isWeixin = true;						
 			}
 			// #endif
+			//7458322156308800
+		},
+		onHide() {
+			this.verify_code=''
 		},
 		methods: {
 			/**
@@ -98,8 +102,6 @@
 				if (!ref.test(this.verify_code)) return self.$util.Tips({
 					title: '请输入正确的核销码'
 				});
-				
-				
 				self.$util.Tips({
 					title: '查询中'
 				});

pages/gather/gather.vue

@@ -33,7 +33,7 @@
 						</image>
 						<text class="text">商品管理</text>
 					</view>
-					<view class="examine" @click="navigator(`/pages/users/gather_list/index?mer_id=${mer_id}`)">
+					<view class="examine" @click="navigator(`/pages/users/embody/embody?mer_id=${mer_id}`)">
 						<image class="icon_img" :src="`${prefix}txgl.png`" mode="aspectFill">
 						</image>
 						<text class="text">提现管理</text>
@@ -58,7 +58,7 @@
 					<view class="title">我的店铺</view>
 					<view class="content ">
 						<view class="examine"
-							@click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98`)">
+							@click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98&cate_id=${userInfoData.mer_info.category_id}`)">
 							<image class="icon_img" :src="`${prefix}ghcg.png`" mode="aspectFill"></image>
 							<text class="text">供货采购</text>
 						</view>
@@ -77,7 +77,7 @@
 							</image>
 							<text class="text">入库管理</text>
 						</view>
-						<view class="examine" @click="navigator(`/pages/users/gather_list/index?mer_id=${mer_id}`)">
+						<view class="examine" @click="navigator(`/pages/users/embody/embody?mer_id=${mer_id}`)">
 							<image class="icon_img" :src="`${prefix}txgl.png`" mode="aspectFill">
 							</image>
 							<text class="text">提现管理</text>
@@ -123,7 +123,7 @@
 					<view class="title">里海云仓</view>
 					<view class="content ">
 						<view class="examine"
-							@click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98`)">
+							@click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98&cate_id=${userInfoData.mer_info.category_id}`)">
 							<image class="icon_img" :src="`${prefix}ghcg.png`" mode="aspectFill"></image>
 							<text class="text">供货采购</text>
 						</view>
@@ -142,7 +142,7 @@
 							</image>
 							<text class="text">入库管理</text>
 						</view>
-						<view class="examine" @click="navigator(`/pages/users/gather_list/index?mer_id=${mer_id}`)">
+						<view class="examine" @click="navigator(`/pages/users/embody/embody?mer_id=${mer_id}`)">
 							<image class="icon_img" :src="`${prefix}txgl.png`" mode="aspectFill">
 							</image>
 							<text class="text">提现管理</text>
@@ -275,6 +275,7 @@
 					if (!res.data.mer_info) {
 						that.$set(this, 'jurisdiction', false);
 					}
+					console.log(that.userInfoData);
 				});
 			}
 		}

pages/nongKe/supply_chain/supplier.vue

@@ -298,6 +298,7 @@
 			};
 		},
 		onLoad(options) {
+			console.log(options);
 			this.product_type = options.product_type ?? 0
 			if (options.street_id != undefined) {
 				this.sotreParam.street_id = options.street_id

pages/product/addGoods/index.vue

@@ -735,13 +735,13 @@
 			setSpecifica() {
 				// specification 为规格 0为单规格 1为多规格
 				if (this.setFormData.spec_type == 0) {
-					navigateTo(1, '/pages/product/addGoods/singleSpecification');
+					navigateTo(1, `/pages/product/addGoods/singleSpecification?code=${this.code}`);
 					return;
 				}
 				if (this.setFormData.spec_type == 1) {
 					let queryData = serialize(this.selectEdAttr);
 					setStorage('modifyPriceData', queryData);
-					navigateTo(1, '/pages/product/addGoods/modifyPrice');
+					navigateTo(1, `/pages/product/addGoods/modifyPrice?code=${this.code}`);
 					return;
 				}
 			},

pages/product/addGoods/modifyPrice.vue

@@ -175,7 +175,7 @@ export default {
 			isBatchOperation: false, // 是否开始批量操作
 			multiSpecificationList: [],
 			addMultiSpecification: [],
-			attrObj: {},
+			attrObj: '',
 			index: 0,
 			imgName: "",
 			batchData: {
@@ -193,9 +193,12 @@ export default {
 		};
 	},
 	onLoad(opt) {
-		this.attrObj = opt;
+		this.attrObj = opt.code;
+
+		
 	},
 	onShow() {
+
 		this.initData();
 	},
 	watch: {
@@ -211,8 +214,7 @@ export default {
 		},
 		batchData:{
 			handler(val){
-				console.log(val);
+				this.multiSpecificationList.bar_code=this.attrObj
-				this.multiSpecificationList
 				setStorage('attrValue', this.multiSpecificationList);
 			},
 			deep:true,
@@ -230,6 +232,7 @@ export default {
 			this.multiSpecificationList.forEach(item => {
 				this.$set(item, 'more_thanFlag', false);
 				this.$set(item, 'select', false);
+				this.$set(item,'bar_code',this.attrObj)
 			});
 		},
 		// 选择图片

pages/product/addGoods/singleSpecification.vue

@@ -114,6 +114,10 @@
 				deep: true
 			}
 		},
+		onLoad(option) {
+			console.log(option);
+			this.singleSpecification.bar_code=option.code
+		},
 		onShow() {
 			if(getStorage('addGoodsFormData').image) {
 				this.singleSpecification.image = getStorage('addGoodsFormData').image;

pages/product/basicSet.vue

@@ -343,6 +343,7 @@
           sizeType: ['original', 'compressed'],
           sourceType: ['album', 'camera'],
           success: function(res) {
+			  console.log(res);
             uni.showLoading({ title: '上传中...' })
             uploads(res.tempFilePaths[0], 'img').then(res => {
               that.images[i].img = res

pages/users/embody/embody.vue

@@ -153,6 +153,7 @@
 				</view>
 			</view>
 		</view>
+		<view class="saomaCode" @click="navigator(`/pages/users/gather_list/index?mer_id=${merId}`)">明细</view>
 		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
 		<cash :payMode='pay_type' :pay_close="pay_close" @payClose="payClose" @onChangeFun="onChangeFun"
 			:order_id="currentTab"></cash>
@@ -483,6 +484,13 @@
 				(action && this[action]) && this[action](value);
 				this.currentTab = opt.type
 			},
+			//明细跳转
+			navigator(url, t) {
+				// if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息");
+				uni.navigateTo({
+					url: url
+				})
+			},
 		}
 	}
 </script>
@@ -735,4 +743,18 @@
 	uni-toast.uni-mask {
 		background-color: rgba(0, 0, 0, 0.5) !important;
 	}
+	.saomaCode {
+	  z-index: 999;
+	  position: fixed;
+	  bottom: 175.44rpx;
+	  right: 28.07rpx;
+	  width: 87.72rpx;
+	  height: 87.72rpx;
+	  border-radius: 175.44rpx;
+	  background-image: linear-gradient(90deg, #FA6514 0%, #E93323 100%);
+	  color: #fff;
+	  text-align: center;
+	  line-height: 87.72rpx;
+	}
+	
 </style>

pages/users/gather_list/index.vue

@@ -4,17 +4,17 @@
 			<view class="head_conent">
 				<view class="tatil">
 					<view class="sum">
-						<u-count-to :startVal="30" :endVal="500"></u-count-to>
+						<u-count-to :startVal="0" :endVal="count"></u-count-to>
 						<h3>提现次数</h3>
 					</view>
 					<view class="sum">
-						<u-count-to :startVal="0" :endVal="a"></u-count-to>
+						<u-count-to :startVal="0" :endVal="sum"></u-count-to>
 						<h3>提现总额</h3>
 					</view>
 				</view>
 			</view>
-			<view class="tixian" @click="navigator(`/pages/users/embody/embody?mer_id=${merId}`)">
+			<view class="tixian" @click="tixian">
-				申请提现
+				立即提现
 			</view>
 		</view>
 		<view class="public-wrapper">
@@ -30,11 +30,11 @@
 			<view class="footer">
 
 				<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y">
-					<view class=" footer_list">
+					<view class=" footer_list" v-for="(item,index) in UserApplylist" :key="index">
-						<view class="data">1</view>
+						<view class="data">{{index+1}}</view>
-						<view class="browse">中国农业银行</view>
+						<view class="browse">{{item.financial_account.bank}}</view>
-						<view class="turnover">3月17</view>
+						<view class="turnover">{{item.create_time}}</view>
-						<view class="money">4000</view>
+						<view class="money">{{item.extract_money}}</view>
 					</view>
 				</scroll-view>
 
@@ -53,13 +53,17 @@
 	// +----------------------------------------------------------------------
 	// | Author: CRMEB Team <admin@crmeb.com>
 	// +----------------------------------------------------------------------
-
+	import {
+		getAdminApplyListAPI
+	} from '@/api/user.js'
 	export default {
 		data() {
 			return {
-				a: 99999999,
+				sum: '',
+				count:'',
 				scrollTop: 0,
-				merId:''
+				merId: '',
+				UserApplylist:[]
 			}
 		},
 		computed: {},
@@ -68,14 +72,34 @@
 		},
 		onLoad(option) {
 			this.merId = option.mer_id
+			console.log(this.merId);
+			this.ApplyList()
+			// this.UserApplylist.forEach((item)=>{
+			// 	console.log(item.extract_money);
+			// })
 		},
 		methods: {
-			navigator(url) {
+			tixian() {
-				uni.navigateTo({
+				uni.navigateBack({
-					url: url
+					delta: 1
-				})
+				});
 			},
-		}
+			ApplyList(){
+				getAdminApplyListAPI(this.merId).then(res=>{
+					console.log(res);
+					this.UserApplylist=res.data.list
+					this.count=res.data.count
+					this.UserApplylist.forEach(item=>{
+						item.create_time=item.create_time.substr(0,10)
+						this.sum=parseInt(item.extract_money)+parseInt(item.extract_money)
+						
+					})
+				}).catch(err=>{
+					console.log(err);
+				})
+			}
+		},
+
 	}
 </script>
 

project.private.config.json

@@ -3,6 +3,7 @@
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "projectname": "nk-shop2.0",
   "setting": {
-    "compileHotReLoad": true
+    "compileHotReLoad": true,
+    "urlCheck": false
   }
 }