商城入驻信息新增弹窗，工作台新增交易申请功能(记录列表、申请同意、拒绝功能等）

api/product.js

@@ -17,14 +17,14 @@ export const getProductDetailsAPI = (data) => request.get('micro/product_details
 /**
  *商品列表
  */
-export const spuInfo = (id,data) => request.get('product/spu/street/'+id, data)
+export const spuInfo = (id, data) => request.get('product/spu/street/' + id, data)
 
 
 /**
  * 线下导入
  */
-export function postImport(merid,data) {
+export function postImport(merid, data) {
-  return request.post(`server/${merid}/product/stockIn`, data);
+	return request.post(`server/${merid}/product/stockIn`, data);
 }
 /**
  * 获取商户基本信息 http://127.0.0.1:8324/api/store/merchant/info?id=4
@@ -38,20 +38,26 @@ export const merchantUpdateAPI = (data) => request.post('store/merchant/update',
  * 商品列表
  */
 export function productLstApi(merId, data) {
-  return request.get(`server/${merId}/product/lst`, data, { login: true });
+	return request.get(`server/${merId}/product/lst`, data, {
+		login: true
+	});
 }
 
 /**
  * 商品列表 -- 删除
  */
 export function productDeleteApi(merId, id) {
-  return request.post(`server/${merId}/product/delete/${id}`, {}, { login: true });
+	return request.post(`server/${merId}/product/delete/${id}`, {}, {
+		login: true
+	});
 }
 /**
  * 商品列表 -- 上下架
  */
 export function productOffApi(merId, id, data) {
-  return request.post(`server/${merId}/product/status/${id}`, data, { login: true });
+	return request.post(`server/${merId}/product/status/${id}`, data, {
+		login: true
+	});
 }
 
 /*
@@ -59,7 +65,9 @@ export function productOffApi(merId, id, data) {
 */
 
 export function productTitle(merId, data) {
-  return request.get(`server/${merId}/product/title`, data, { login: true });
+	return request.get(`server/${merId}/product/title`, data, {
+		login: true
+	});
 }
 
 /*
@@ -67,7 +75,9 @@ export function productTitle(merId, data) {
 */
 
 export function productDestory(merId, id, data) {
-  return request.post(`server/${merId}/product/destory/${id}`, data, { login: true });
+	return request.post(`server/${merId}/product/destory/${id}`, data, {
+		login: true
+	});
 }
 
 /*
@@ -75,7 +85,9 @@ export function productDestory(merId, id, data) {
 */
 
 export function productRestore(merId, id) {
-  return request.post(`server/${merId}/product/restore/${id}`, {}, { login: true });
+	return request.post(`server/${merId}/product/restore/${id}`, {}, {
+		login: true
+	});
 }
 
 /*
@@ -83,7 +95,9 @@ export function productRestore(merId, id) {
 */
 
 export function categoryBrandlist(merId) {
-  return request.get(`server/${merId}/category/brandlist`, {}, { login: true });
+	return request.get(`server/${merId}/category/brandlist`, {}, {
+		login: true
+	});
 }
 
 /*
@@ -91,7 +105,9 @@ export function categoryBrandlist(merId) {
 */
 
 export function categorySelect(merId) {
-  return request.get(`server/${merId}/category/select`, {}, { login: true })
+	return request.get(`server/${merId}/category/select`, {}, {
+		login: true
+	})
 }
 
 /*
@@ -99,7 +115,9 @@ export function categorySelect(merId) {
 */
 
 export function categoryList(merId) {
-  return request.get(`server/${merId}/category/list`, {}, { login: true })
+	return request.get(`server/${merId}/category/list`, {}, {
+		login: true
+	})
 }
 
 /*
@@ -107,13 +125,17 @@ export function categoryList(merId) {
 */
 
 export function productCreate(merId, data) {
-  return request.post(`server/${merId}/product/create`, data, { login: true })
+	return request.post(`server/${merId}/product/create`, data, {
+		login: true
+	})
 }
 /**
  * 商品列表 -- 设置推荐
  */
 export function productRecommendApi(merId, id, data) {
-  return request.post(`server/${merId}/product/good/${id}`, data, { login: true });
+	return request.post(`server/${merId}/product/good/${id}`, data, {
+		login: true
+	});
 }
 
 /*
@@ -121,119 +143,181 @@ export function productRecommendApi(merId, id, data) {
 */
 
 export function attrList(merId, data) {
-  return request.get(`server/${merId}/attr/lst`, data, { login: true })
+	return request.get(`server/${merId}/attr/lst`, data, {
+		login: true
+	})
 }
 /*
 	请求运费模板
 */
 export function templateList(merId, data) {
-  return request.get(`server/${merId}/template/lst`, data, { login: true })
+	return request.get(`server/${merId}/template/lst`, data, {
+		login: true
+	})
 }
 /*
 	运费模板 -- 删除
 */
 export function templateDelete(merId, data) {
-  return request.post(`server/${merId}/template/delete`, data, { login: true })
+	return request.post(`server/${merId}/template/delete`, data, {
+		login: true
+	})
 }
 /**
  * 运费模板 -- 详情
  */
 export function templateDetail(merId, id) {
-  return request.get(`server/${merId}/template/detail/${id}`, {}, { login: true });
+	return request.get(`server/${merId}/template/detail/${id}`, {}, {
+		login: true
+	});
 }
 /*
 	运费模板 -- 添加
 */
 export function templateCreate(merId, data) {
-  return request.post(`server/${merId}/template/create`, data, { login: true });
+	return request.post(`server/${merId}/template/create`, data, {
+		login: true
+	});
 }
 /*
 	运费模板 -- 编辑
 */
 export function templateUpdate(merId, id, data) {
-  return request.post(`server/${merId}/template/update/${id}`, data, { login: true });
+	return request.post(`server/${merId}/template/update/${id}`, data, {
+		login: true
+	});
 }
 /**
  * 店铺分类 -- 列表
  */
 export function storeClassifyLst(merId) {
-  return request.get(`server/${merId}/category/lst`, {}, { login: true });
+	return request.get(`server/${merId}/category/lst`, {}, {
+		login: true
+	});
 }
 /**
  * 店铺分类 -- 列表(删除)
  */
 export function storeClassifyDel(merId, id) {
-  return request.post(`server/${merId}/category/delete/${id}`, {}, { login: true });
+	return request.post(`server/${merId}/category/delete/${id}`, {}, {
+		login: true
+	});
 }
 /**
  * 上级分类 -- 商户列表
  */
 export function merClassifyLst(merId) {
-  return request.get(`server/${merId}/category/select`, {}, { login: true });
+	return request.get(`server/${merId}/category/select`, {}, {
+		login: true
+	});
 }
 /**
  * 店铺分类 -- 添加
  */
 export function merClassifyAdd(merId, data) {
-  return request.post(`server/${merId}/category/create`, data, { login: true });
+	return request.post(`server/${merId}/category/create`, data, {
+		login: true
+	});
 }
 /**
  * 店铺分类 -- 详情
  */
 export function merClassifyDetail(merId, id) {
-  return request.get(`server/${merId}/category/detail/${id}`, {}, { login: true });
+	return request.get(`server/${merId}/category/detail/${id}`, {}, {
+		login: true
+	});
 }
 /**
  * 店铺分类 -- 编辑
  */
 export function merClassifyUpdate(merId, id, data) {
-  return request.post(`server/${merId}/category/update/${id}`, data, { login: true });
+	return request.post(`server/${merId}/category/update/${id}`, data, {
+		login: true
+	});
 }
 /**
  * 商品规格项目 -- 列表
  */
 export function specificationLst(merId, data) {
-  return request.get(`server/${merId}/attr/lst`, data, { login: true });
+	return request.get(`server/${merId}/attr/lst`, data, {
+		login: true
+	});
 }
 /**
  * 商品规格项目 -- 删除
  */
 export function specificationDel(merId, data) {
-  return request.post(`server/${merId}/attr/delete`, data, { login: true });
+	return request.post(`server/${merId}/attr/delete`, data, {
+		login: true
+	});
 }
 /**
  * 商品规格项目 -- 添加
  */
 export function specificationAdd(merId, data) {
-  return request.post(`server/${merId}/attr/create`, data, { login: true });
+	return request.post(`server/${merId}/attr/create`, data, {
+		login: true
+	});
 }
 /**
  * 商品规格项目 -- 编辑
  */
 export function specificationUpdate(merId, id, data) {
-  return request.post(`server/${merId}/attr/update/${id}`, data, { login: true });
+	return request.post(`server/${merId}/attr/update/${id}`, data, {
+		login: true
+	});
 }
 /**
  * 商品规格项目 -- 详情
  */
 export function specificationDetail(merId, id) {
-  return request.get(`server/${merId}/attr/detail/${id}`, {}, { login: true });
+	return request.get(`server/${merId}/attr/detail/${id}`, {}, {
+		login: true
+	});
 }
 /*
 	请求商品详情
 */
 export function productDetail(merId, id) {
-  return request.get(`server/${merId}/product/detail/${id}`, {}, { login: true });
+	return request.get(`server/${merId}/product/detail/${id}`, {}, {
+		login: true
+	});
 }
 /*
 	编辑商品
 */
 export function productUpdate(merId, id, data) {
-  return request.post(`server/${merId}/product/update/${id}`, data, { login: true });
+	return request.post(`server/${merId}/product/update/${id}`, data, {
+		login: true
+	});
 }
 /*
 	添加商品 -- 获取送货方式信息
 */
 export function getDeliveryType(merId) {
-  return request.get(`server/${merId}/product/config`, {}, { login: true });
+	return request.get(`server/${merId}/product/config`, {}, {
+		login: true
+	});
+}
+
+/*
+	商品 -- 获取交易协议内容
+*/
+export function business() {
+	return request.get(`business/agree?type=business_apply_agree`, {}, {
+		noAuth: true
+	});
+}
+/*
+	商品 -- 获取交易申请记录
+*/
+export function intention(data) {
+	return request.get(`intention/lst`, data);
+}
+
+/*
+	商品 -- 同意提交申请
+*/
+export function intentionbus(data) {
+	return request.post(`intention/business`, {});
 }

api/store.js

@@ -573,3 +573,10 @@ export function supAgoodsApi(data) {
 export function vicinityStoreApi(data) {
 	return request.get(`region/${data}/merchant`);
 }
+
+/*
+	商家入驻 -- 获取商户入驻申请协议内容
+*/
+export function agreeiness() {
+  return request.get(`business/agree?type=sys_intention_agree`, {}, { noAuth: true });
+}

api/user.js

@@ -720,3 +720,4 @@ export function getBankInfo() {
 export function getBillDetil() {
   return request.get(`mer/financial_record`)
 }
+

config/app.js

@@ -9,8 +9,8 @@ let httpApiThree
 // 网络接口修改此字符 小程序域名要求https
 // let httpApi = 'http://192.168.31.110:8324' // 测试
 if (process.env.NODE_ENV === "development") {
-	 httpApi = 'https://shop.lihaink.cn' // 生产
+	   // httpApi = 'https://shop.lihaink.cn' // 生产
-      // httpApi = "https://crmeb-test.shop.lihaink.cn"
+      httpApi = "https://crmeb-test.shop.lihaink.cn"
 	// httpApi = "http://192.168.0.222"
 	// httpApi = "http://192.168.0.108:8325"
 	// httpApi = 'http://192.168.0.108:8325'
@@ -22,11 +22,11 @@ if (process.env.NODE_ENV === "development") {
 	// httpApiTwo = "baseUrl" // h5跨域配置
 	httpApiTwo = "https://nk.lihaink.cn" // h5跨域配置
 	// httpApiThree = 'baseUrlTest' // h5跨域配置
+	
 	// #endif
 } else if (process.env.NODE_ENV === 'production') {
-	httpApi = 'https://shop.lihaink.cn' // 生产
+	// httpApi = 'https://shop.lihaink.cn' // 生产
-	
+	httpApi = "https://crmeb-test.shop.lihaink.cn"
-	// httpApi = "https://crmeb-test.shop.lihaink.cn"
 	httpApiTwo = 'https://nk.lihaink.cn' // 生产
 	httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产
 }

manifest.json

@@ -2,8 +2,8 @@
     "name" : "惠农生活",
     "appid" : "__UNI__3A527D1",
     "description" : "",
-    "versionName" : "1.3.8",
+    "versionName" : "1.3.9",
-    "versionCode" : 138,
+    "versionCode" : 139,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages.json

@@ -1123,6 +1123,18 @@
 						"navigationBarTitleText": "商品管理",
 						"enablePullDownRefresh": true
 					}
+				},{
+					"path": "transactionApplication/index",
+					"style": {
+						"navigationBarTitleText": "交易申请",
+						"enablePullDownRefresh": true
+					}
+				},{
+					"path": "transactionApplication/application",
+					"style": {
+						"navigationBarTitleText": "申请记录",
+						"enablePullDownRefresh": true
+					}
 				},
 				{
 					"path": "goodsOnSale/index",

pages/guide/guide.vue

@@ -66,7 +66,7 @@
 		},
 		mounted() {
 
-this.countDown()
+			this.countDown()
 
 		},
 		methods: {
@@ -74,7 +74,7 @@ this.countDown()
 				let {
 					num
 				} = this;
-				if (num === 3) this.nums = true;
+				// if (num === 3) this.nums = true;
 				num = num > 0 ? num - 1 : "GO";
 				setTimeout(() => {
 					this.num = num;

pages/moreProject/moreProject.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="gather">
 		<block v-if="isShow">
-			<view class="" v-if="userInfoData.mer_info.setup_status==1">
+			<view class="" v-if="userInfoData.mer_info.business_status==2">
 				<view class="special_work com" v-if="userInfoData.mer_info.type_code === 'TypeSupplyChain'">
 					<view class="special_work com" v-if="true">
 						<view class="title">市级供应链</view>
@@ -37,6 +37,12 @@
 								<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill"></image>
 								<text class="text">商户设置</text>
 							</view>
+							<view class="examine"
+								@click="navigator(`/pages/product/transactionApplication/index?mer_id=${mer_id}`, '交易申请')">
+								<image class="icon_img" src="@/static/images/jy.png" mode="aspectFill">
+								</image>
+								<text class="text">交易申请</text>
+							</view>
 							<view class="examine" @click="navigator(`/pages/product/list/index?mer_id=${mer_id}`)">
 								<image class="icon_img" :src="`${prefix}spgl.png`" mode="aspectFill">
 								</image>
@@ -91,7 +97,7 @@
 						<view class="special_work com">
 							<view class="title">我的店铺</view>
 							<view class="content ">
-							<!-- 	<view class="examine"
+								<!-- 	<view class="examine"
 								
 								
 									@click="navigator(`/pages/users/supply_procurement/index?type_id=12&isDetail=1&product_type=98&cate_id=${userInfoData.mer_info.category_id}`)">
@@ -151,6 +157,12 @@
 									</image>
 									<text class="text">商户设置</text>
 								</view>
+								<view class="examine"
+									@click="navigator(`/pages/product/transactionApplication/index?mer_id=${mer_id}`, '交易申请')">
+									<image class="icon_img" src="@/static/images/jy.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">
@@ -251,6 +263,12 @@
 									</image>
 									<text class="text">商户设置</text>
 								</view>
+								<view class="examine"
+									@click="navigator(`/pages/product/transactionApplication/index?mer_id=${mer_id}`, '交易申请')">
+									<image class="icon_img" src="@/static/images/jy.png" mode="aspectFill">
+									</image>
+									<text class="text">交易申请</text>
+								</view>
 								<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
 							<image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">
 							</image>
@@ -304,6 +322,12 @@
 									</image>
 									<text class="text">商户设置</text>
 								</view>
+								<view class="examine"
+									@click="navigator(`/pages/product/transactionApplication/index?mer_id=${mer_id}`, '交易申请')">
+									<image class="icon_img" src="@/static/images/jy.png" mode="aspectFill">
+									</image>
+									<text class="text">交易申请</text>
+								</view>
 							</view>
 						</view>
 					</view>
@@ -325,9 +349,16 @@
 								</image>
 								<text class="text">商户设置</text>
 							</view>
+
+							<view class="examine" 	@click="navigator(`/pages/product/transactionApplication/index?mer_id=${mer_id}&business_status=${userInfoData.mer_info.business_status}`, '交易申请')">
+								<image class="icon_img" src="@/static/images/jy.png" mode="aspectFill">
+								</image>
+								<text class="text">交易申请</text>
+							</view>
 						</view>
 					</view>
 				</view>
+
 			</view>
 
 		</block>
@@ -425,6 +456,8 @@
 		methods: {
 
 
+
+			//获取定位
 			appLocation() {
 				uni.getLocation({
 					type: 'wgs84',
@@ -450,11 +483,11 @@
 					},
 					fail: (err) => {
 
-						uni.showToast({
+						// uni.showToast({
-							title: "获取定位超时",
+						// 	title: "获取定位超时",
-							icon: 'none',
+						// 	icon: 'none',
-							duration: 2000
+						// 	duration: 2000
-						});
+						// });
 					}
 				});
 			},

pages/store/settled/index.vue

@@ -125,8 +125,8 @@
 					<view class="item">
 						<view class="acea-row row-middle">
 							<text class="item-name">法人名称</text>
-							<input type="text" placeholder="请输入法人名称" v-model="merchantData.user_name" @input="validateBtn"
+							<input type="text" placeholder="请输入法人名称" v-model="merchantData.user_name"
-								placeholder-class='placeholder' />
+								@input="validateBtn" placeholder-class='placeholder' />
 						</view>
 					</view>
 					<view class="item">
@@ -173,7 +173,10 @@
 						</checkbox-group>
 						<button class="settleAgree" @click="getConfig">《入驻协议》</button>
 					</view>
-					<button class='submitBtn' :class="validate === true ? 'on':''" @click="formSubmit">提交申请</button>
+
+					<button class='submitBtn' :class="validate === true? 'on':''" @click="formSubmit">
+						提交申请
+					</button>
 				</view>
 			</view>
 		</form>
@@ -187,6 +190,28 @@
 				</view>
 			</view>
 		</view>
+		<view class="settlementAgreement" v-if="isshow">
+			<view class="setAgCount">
+				<i class="icon iconfont icon-cha" @click="recuo"></i>
+				<div class="title">商户入驻协议</div>
+				<view class="contenta">
+					<jyf-parser :html="detail.sys_intention_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
+
+				</view>
+				<view class="setAgCountbtn">
+					<button class="setAgCountbtna" @click="refuse">
+						拒绝
+					</button>
+
+
+					<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0" @click="isshow=false">
+						<text v-if="num>0">请仔细阅读协议{{num}}S</text>
+						<text v-else>同意</text>
+
+					</button>
+				</view>
+			</view>
+		</view>
 		<view class='loadingicon acea-row row-center-wrapper' v-if="loading">
 			<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>
 		</view>
@@ -222,7 +247,8 @@
 		merClassifly,
 		getGoodsDetails,
 		updateGoodsRecord,
-		getStoreTypeApi
+		getStoreTypeApi,
+		agreeiness
 	} from '@/api/store.js';
 	import {
 		getCaptcha,
@@ -267,6 +293,7 @@
 				showProtocol: false,
 				isShowCode: false,
 				loading: false,
+				isshow: false,
 				merchantData: {
 					enterprise_name: "",
 					user_name: "",
@@ -315,6 +342,8 @@
 				},
 				mer_i_id: null, // 商户申请id
 				isType: false,
+				num: 30,
+				detail: {}
 			};
 		},
 		beforeDestroy() {
@@ -324,6 +353,7 @@
 			sys_intention_agree: ''
 		}, mapGetters(['isLogin', 'viewColor', 'keyColor'])),
 		onLoad(options) {
+
 			if (this.isLogin) {
 				this.getClassfication();
 				this.getStoreType();
@@ -341,10 +371,61 @@
 				})
 			}
 			this.getArea()
+			this.shoplist()
 		},
 		onShow() {},
 		onReady() {},
 		methods: {
+			//关闭弹窗
+			recuo() {
+				if (this.num > 0) {
+					this.num = 30
+					this.isshow = false
+				} else {
+					this.num = 0
+					this.isshow = false
+				}
+			},
+			//拒绝
+			refuse() {
+
+
+				uni.switchTab({
+					url: '/pages/user/index'
+				})
+			},
+			countDown() {
+				let {
+					num
+				} = this;
+				// if (num === 3) this.nums = true;
+				num = num > 0 ? num - 1 : "0";
+				setTimeout(() => {
+
+					this.num = num;
+					if (num == '0') {
+						// this.launchApp()
+						return
+					}
+					if (this.isshow == false && this.num > 0) {
+						this.num = 30
+						return
+					}
+					this.countDown();
+				}, 1000);
+
+
+			},
+
+			//获取商户入驻申请协议
+			shoplist() {
+				agreeiness().then(res => {
+					console.log(res)
+					this.detail = res.data
+				})
+			},
+
+
 			//是否是农贸市场
 			// change(e) {
 			// 	this.isnum = (e === true ? 1 : 0)
@@ -459,7 +540,7 @@
 				this.validateBtn()
 			},
 			bindPickerChange1: function(e) {
-				console.log(e);
+
 				this.index1 = e.target.value
 				let idx = e.target.value
 				this.merchantData.mer_type = this.storeTypeArr[idx]['mer_type_id']
@@ -491,7 +572,7 @@
 			getStoreType: function() {
 				getStoreTypeApi()
 					.then(res => {
-						console.log(res);
+
 						this.storeTypeArr = res.data
 					})
 					.catch(res => {
@@ -634,62 +715,77 @@
 				this.isAgree = !this.isAgree;
 				this.validateBtn();
 			},
-			formSubmit: function(e) {
+			//协议弹窗
-				let that = this;
+			showxy() {
-				if (that.validateForm() && that.validate) {
+				this.isshow = true
-					let requestData = {
+			},
-						phone: that.merchantData.phone,
-						mer_name: that.merchantData.enterprise_name,
-						name: that.merchantData.user_name,
-						code: that.merchantData.yanzhengma,
-						company_name:that.merchantData.company_name,
-						address:that.merchantData.address,
-						social_credit_code: that.merchantData.social_credit_code,
-						merchant_category_id: that.merchantData.classification,
-						mer_type_id: that.merchantData.mer_type,
-						mer_storeType: this.mer_storeType,
-						area_id: this.area_id,
-						street_id: this.street_id,
-						village_id: this.village_id,
-						is_nmsc: this.isnum,
-						images: that.pics
-					}
-					that.validate = false;
-					if (that.mer_i_id) {
-						updateGoodsRecord(that.mer_i_id, requestData).then(res => {
-							if (res.status == 200) {
-								title: '提交成功',
-								that.loading = true;
-								that.timer = setTimeout(() => {
-									that.successful = true;
-									that.validate = true;
-								}, 1000)
-							}
-						}).catch(res => {
-							that.validate = true;
-							that.$util.Tips({
-								title: res
-							});
-						})
-					} else {
-						create(requestData).then(data => {
-							if (data.status == 200) {
-								title: '提交成功',
-								that.loading = true;
-								this.timer = setTimeout(() => {
-									that.successful = true;
-									that.validate = true;
-								}, 1000)
-							}
 
-						}).catch(res => {
+			formSubmit: function(e) {
-							that.validate = true;
+
-							that.$util.Tips({
+				if (this.num == 0) {
-								title: res
+
-							});
+					let that = this;
-						})
+					if (that.validateForm() && that.validate) {
+						let requestData = {
+							phone: that.merchantData.phone,
+							mer_name: that.merchantData.enterprise_name,
+							name: that.merchantData.user_name,
+							code: that.merchantData.yanzhengma,
+							company_name: that.merchantData.company_name,
+							address: that.merchantData.address,
+							social_credit_code: that.merchantData.social_credit_code,
+							merchant_category_id: that.merchantData.classification,
+							mer_type_id: that.merchantData.mer_type,
+							mer_storeType: this.mer_storeType,
+							area_id: this.area_id,
+							street_id: this.street_id,
+							village_id: this.village_id,
+							is_nmsc: this.isnum,
+							images: that.pics
+						}
+						that.validate = false;
+						if (that.mer_i_id) {
+							updateGoodsRecord(that.mer_i_id, requestData).then(res => {
+								if (res.status == 200) {
+									title: '提交成功',
+									that.loading = true;
+									that.timer = setTimeout(() => {
+										that.successful = true;
+										that.validate = true;
+									}, 1000)
+								}
+							}).catch(res => {
+								that.validate = true;
+								that.$util.Tips({
+									title: res
+								});
+							})
+						} else {
+							create(requestData).then(data => {
+								if (data.status == 200) {
+									title: '提交成功',
+									that.loading = true;
+									this.timer = setTimeout(() => {
+										that.successful = true;
+										that.validate = true;
+									}, 1000)
+								}
+
+							}).catch(res => {
+								that.validate = true;
+								that.$util.Tips({
+									title: res
+								});
+							})
+						}
 					}
+
+
+				} else {
+					this.isshow = true
+					this.countDown()
 				}
+
 			},
 			validateBtn: function() {
 				let that = this,
@@ -1128,7 +1224,7 @@
 	.settlementAgreement .setAgCount {
 		background: #fff;
 		width: 656rpx;
-		height: 458px;
+		// height: 458px;
 		position: absolute;
 		top: 50%;
 		left: 50%;
@@ -1181,6 +1277,82 @@
 		overflow-y: scroll;
 	}
 
+
+	.settlementAgreement .setAgCount .contenta {
+		margin-top: 32rpx;
+		color: #333;
+		font-size: 26rpx;
+		line-height: 22px;
+		text-align: justify;
+		text-justify: distribute-all-lines;
+
+		/*#ifdef H5*/
+		height: 600rpx;
+		/*#endif*/
+		/*#ifdef APP-PLUS*/
+		height: 530rpx;
+		/*#endif*/
+
+		overflow-y: scroll;
+
+
+	}
+
+	.setAgCountbtn {
+		display: flex;
+		justify-content: space-around;
+
+		.setAgCountbtna {
+			margin-top: 40rpx;
+			width: 150rpx;
+			height: 74rpx;
+			text-align: center;
+			line-height: 74rpx;
+			border-radius: 46rpx 46rpx;
+			opacity: 1;
+			border: 2rpx solid #B3B3B3;
+			font-size: 25rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 500;
+			color: #737373;
+
+		}
+
+		.setAgCountbtnb {
+			margin-top: 40rpx;
+			padding-left: 20rpx;
+			padding-right: 20rpx;
+			height: 74rpx;
+			text-align: center;
+			line-height: 74rpx;
+			background: linear-gradient(270deg, #FF6D20 0%, #F84221 100%);
+			border-radius: 46rpx 46rpx;
+			opacity: 1;
+
+			font-size: 25rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 500;
+			color: #fff;
+
+		}
+
+		.setAgCountbtnc {
+			margin-top: 40rpx;
+			width: 150rpx;
+			height: 74rpx;
+			text-align: center;
+			line-height: 74rpx;
+			background: linear-gradient(270deg, #FF6D20 0%, #F84221 100%);
+			border-radius: 46rpx 46rpx;
+			opacity: 1;
+			font-size: 25rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 500;
+			color: #fff;
+
+		}
+	}
+
 	.settledSuccessMain {
 		height: 100vh;
 		display: flex;

uni_modules/uview-ui/libs/config/config.js

@@ -3,7 +3,8 @@ const version = '2.0.36'
 
 // 开发环境才提示，生产环境不会提示
 if (process.env.NODE_ENV === 'development') {
-	console.log(`\n %c uView V${version} %c https://uviewui.com/ \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0; border-radius: 5px;');
+	// console.log(`\n %c uView V${version} %c https://uviewui.com/ \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0; border-radius: 5px;');
+console.log('当前属于测试环境')
 }
 
 export default {