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

api/api.js

@@ -305,3 +305,8 @@ export function paymerchant() {
 export function merchant(data) {
   return request.get(`store/merchant/margin`, data);
 }
+
+//获取保证金缴纳列表
+export function marginlist(data) {
+	return request.get(`user/margin/list`,data);
+}

config/app.js

@@ -9,8 +9,8 @@ let httpApiThree
 let httpApiFour
 
 // 在打包之前请检查当前环境是否正确
-const env = 'dev'; // 开发
+// const env = 'dev'; // 开发
-// const env = 'prod'; // 生产
+const env = 'prod'; // 生产
 // const env = 'prew'; // 预上线
 
 switch (env) {
@@ -34,37 +34,7 @@ switch (env) {
 }
 
 
-// // 网络接口修改此字符 小程序域名要求https
-// // let httpApi = 'http://192.168.31.110:8324' // 测试
-// if (process.env.NODE_ENV === "development") {
-// 	   httpApi = 'https://shop.lihaink.cn' // 生产
-// 	    // httpApi = 'https://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'
-// 	// #ifdef MP-WEIXIN
-// 	httpApiTwo = "https://nk.lihaink.cn"
-// 	httpApiThree = 'http://ceshi-oa.lihaink.cn'
-// 	// #endif
-// 	// #ifdef H5
-// 	// 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://test.shop.lihaink.cn' //预发布环境
-
-// 	// httpApi = "https://crmeb-test.shop.lihaink.cn"
-// 	httpApiTwo = 'https://nk.lihaink.cn' // 生产
-// 	httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产
-// }
-// httpApi = 'https://shop.lihaink.cn' // 生产
-// httpApiTwo = 'https://nk.lihaink.cn' // 生产
 
 // 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer.crmeb.net
 // let wsApi = 'ws://192.168.3.20:8324'

manifest.json

@@ -2,8 +2,8 @@
     "name" : "惠农生活",
     "appid" : "__UNI__3A527D1",
     "description" : "",
-    "versionName" : "1.4.3",
+    "versionName" : "1.4.4",
-    "versionCode" : 143,
+    "versionCode" : 144,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/margin/margin.vue

@@ -6,7 +6,7 @@
 	    <view class="title">店铺保证金信息</view>
 		<view class="item">
 		  <text>已缴纳保证金</text>
-		  <text>{{merchant_Data.margin}}</text>
+		  <text>{{merchant_Data.paid_margin}}</text>
 		</view>
 	    <view class="item">
 	      <text>缴纳店铺账户</text>
@@ -17,7 +17,7 @@
     <view class="price">
       <view class="title">缴纳金额</view>
       <view class="tab">
-        <view class="item active" style="margin: 0;">{{merchant_Data.recharge_margin}}元</view>
+        <view class="item active" style="margin: 0;">{{merchant_Data.margin}}元</view>
       </view>
       <button class="btn" @click="paydecimal">缴纳</button>
     </view>
@@ -26,27 +26,82 @@
       <view class="text">充值后帐户的金额不能提现，可用于商城消费使用佣金导入账户之后不能再次导出、不可提现账户充值出现问题可联系商城客服，也可拨打商城客服热线<text @click="copyPhone('4008888888')">4008888888</text>
       </view>
     </view> -->
+	
+	<view class="content-order" v-for="(item,i ) in productList">
+		<view class="">订单编号：{{item.order_sn}}</view>
+		<view class="">支付金额：{{item.total_price}}</view>
+		<view class="">支付状态：{{item.pay_type==1?'已支付':'待支付'}}</view>
+		<view class="">支付时间：{{item.pay_time}}</view>
+	</view>
+	<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
+		<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+	</view>
   </view>
 </template>
 
 <script>
 	import {
 		merchant,
-		paymerchant
+		paymerchant,
+		 marginlist
 	} from '@/api/api.js'
 	export default {
 		data() {
 			return {
 				mer_id:0,
 				merchant_Data: {},
+				where:{
+					page:1,
+					limit:10
+				},
+				productList:[],
+				loadend: false,
+				loading: false,
+				loadTitle: '加载更多',
 			}
 		},
 		onLoad(e) {
 			this.mer_id = e.mer_id
 			this.decimal()
+			this.list(false)
 
+		},
+		onReachBottom() {
+		if (this.productList.length > 0) {
+			setTimeout(() => {
+				this.list(false);
+			}, 1000)
+		}
 		},
 		methods: {
+			list(isPage){
+				let that = this;
+				if (that.loadend) return;
+				if (that.loading) return;
+				if (isPage === true) that.$set(that, 'productList', []);
+				
+				that.loading = true;
+				that.loadTitle = '';
+				 marginlist(that.where).then(res => {
+					let list = res.data.list;
+					let productList = that.$util.SplitArray(list, that.productList);
+					let loadend = list.length < that.where.limit;
+					that.loadend = loadend;
+					that.loading = false;
+					that.loadTitle = loadend ? '已全部加载' : '加载更多';
+					setTimeout(() => {
+						that.$set(that, 'productList', productList);
+					}, 500)
+				
+					// console.log(that.productList)
+					that.$set(that.where, 'page', that.where.page + 1);
+					if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true
+				}).catch(err => {
+					that.loading = false;
+					that.loadTitle = '加载更多';
+				});
+				
+			},
 			//获取保证金信息
 			decimal() {
 				merchant({
@@ -105,7 +160,24 @@
   page {
     background-color: #fff;
   }
+.content-order{
 	
+
+	background: #F4F4F4;
+	border-radius: 21rpx 21rpx ;
+	margin-top: 30rpx;
+	padding: 10rpx;
+	margin-left: 10rpx;
+	margin-right:  10rpx;
+	view{
+		font-size: 30rpx;
+		font-family: PingFang SC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #333333;
+		margin: 20rpx;
+		
+	}
+}
   .info {
     display: flex;
     flex-direction: column;

pages/moreProject/moreProject.vue

@@ -628,6 +628,9 @@
 			this.getUserInfo()
 			this.codelist()
 			this.list()
+
+
+
 		},
 
 
@@ -684,24 +687,6 @@
 				this.$refs.popup.open()
 				this.isFshow = false
 
-				// intentionbus({
-				// 	"status": 1
-				// }).then((res) => {
-				// 	if (res.status == 200) {
-				// 		this.$util.Tips({
-				// 			title: res.message,
-				// 			icon: 'success',
-				// 		})
-				// 		this.getUserInfo()
-				// 		this.isFshow = false
-				// 	}
-				// }).catch((err) => {
-				// 	this.isFshow = false
-				// 	this.$util.Tips({
-				// 		title: err,
-				// 		icon: 'error',
-				// 	})
-				// })
 			},
 			//拒绝
 			refuse() {
@@ -847,9 +832,23 @@
 			//保证金缴纳
 			margin(url) {
 				if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
+
+					if (this.codenote.length == 0) {
 						this.isFshow = true
 						this.countDown()
 					} else {
+						if (this.codenote[0].status == 0) {
+							uni.showModal({
+								title: '申请正在审核中，请勿重复提交'
+							})
+						} else {
+							this.isFshow = true
+							this.countDown()
+						}
+					}
+
+				} else {
+
 					uni.navigateTo({
 						url: url + `?mer_id=` + this.mer_id
 					})
@@ -863,10 +862,27 @@
 				})
 			},
 			navigator(url, t) {
+
 				if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
+					// console.log(this.codenote)
+
+
+					if (this.codenote.length == 0) {
 						this.isFshow = true
 						this.countDown()
 					} else {
+						if (this.codenote[0].status == 0) {
+							uni.showModal({
+								title: '申请正在审核中，请勿重复提交'
+							})
+						} else {
+							this.isFshow = true
+							this.countDown()
+						}
+					}
+
+				} else {
+
 					uni.navigateTo({
 						url: url
 					})
@@ -881,9 +897,9 @@
 						street_code: res.data.mer_info.street_id
 					}).then((res) => {
 						if (res.code == 0) {
-							this.$util.Tips({
+							// this.$util.Tips({
-								title: res.msg
+							// 	title: res.msg
-							});
+							// });
 							return false;
 						}
 						this.company = res.data.title
@@ -983,6 +999,7 @@
 	.item-card {
 		display: flex;
 		margin-top: 20rpx;
+
 		.item-carda {
 			width: 298rpx;
 			height: 175rpx;

pages/product/basicSet.vue

@@ -7,8 +7,10 @@
 			<view class="store_bg">
 				<view class="text flex_a_c"><i class="iconfont icon-xinghao"></i>上传店铺背景图</view>
 				<block v-if="images[0].img">
-					<u--image :showLoading="true" :src="images[0].img" width="388px" height="210.53rpx" radius="4px"
+	<!-- 				<u--image :showLoading="true" :src="images[0].img" width="388px" height="210.53rpx" radius="4px"
-						@click="delImg(0)" mode="aspectFit"></u--image>
+						@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>
 				</block>
 				<view v-else class="upload" @click="seleckImage(0)">
 					<view class="iconfont icon-tupian1"></view>

pages/store/merchantDetails/index.vue

@@ -6,7 +6,7 @@
 				恭喜，您的申请已通过！
 			</view>
 		</view>
-		<view class="msg" v-if="mer_id > 0 && resData.login_url">
+		<!-- <view class="msg" v-if="mer_id > 0 && resData.login_url">
 			<view class="url">
 				<text class="head">登录地址：</text>
 				<text class="content">{{resData.login_url}}</text>
@@ -18,7 +18,7 @@
 				</view>
 				<text class="cope" @click="copyTBL()">复制</text>
 			</view>
-		</view>
+		</view> -->
 		<view class="btn" v-if="mer_id > 0">
 			<view class="">
 				温馨提示：初始密码默认为手机号后六位，请初次登录后及时修改

pages/store/settled/index.vue

@@ -194,7 +194,8 @@
 		<view class="settlementAgreement" v-if="isshow">
 			<view class="setAgCount" style="width: 100%;height: 100%;">
 				<!-- <i class="icon iconfont icon-cha" @click="recuo"></i> -->
-				<view class="" style="width: 60rpx;height: 60rpx; position: absolute;right: 30rpx; top:20rpx" @click="recuo">
+				<view class="" style="width: 60rpx;height: 60rpx; position: absolute;right: 30rpx; top:20rpx"
+					@click="recuo">
 					<image src="@/static/images/close.png" mode="aspectFit" style="width: 60rpx;height: 60rpx;"></image>
 				</view>
 
@@ -756,10 +757,11 @@
 			formSubmit: function(e) {
 
 
-				if (this.num == 0) {
+
 
 				let that = this;
 				if (that.validateForm() && that.validate) {
+					if (this.num == 0) {
 						let requestData = {
 							phone: that.merchantData.phone,
 							mer_name: that.merchantData.enterprise_name,
@@ -813,14 +815,15 @@
 								});
 							})
 						}
-					}
-
-
 					} else {
 						this.isshow = true
 						this.countDown()
 					}
 
+				}
+
+
+
 			},
 			validateBtn: function() {
 				let that = this,

pages/users/user_info/index.vue

@@ -103,13 +103,13 @@
               <text class='iconfont icon-you'></text>
             </navigator>
           </view>
-          <!-- <view class='item acea-row row-between-wrapper'>
+          <view class='item acea-row row-between-wrapper'>
             <view>注销账号</view>
             <view class='input acea-row row-between-wrapper' @click="changeCancel">
               <input type='text' placeholder="账号注销后不能恢复" disabled='true' class='id'></input>
               <text class='iconfont icon-you'></text>
             </view>
-          </view> -->
+          </view>
           <!--#ifdef APP-PLUS-->
           <view class='item acea-row row-between-wrapper'>
             <view>当前版本</view>

utils/requestb.js

@@ -19,7 +19,7 @@ import {
 import store from '../store';
 
 
-console.log(HTTP_REQUEST_URL_FOUR)
+// console.log(HTTP_REQUEST_URL_FOUR)
 
 /**
  * 发送请求
@@ -46,7 +46,7 @@ function baseRequest(url, method, data, {
 				// #ifdef APP-PLUS
 				// console.log('app', Url + '/api/' + url, res.data);
 				// #endif
-				console.log(res.data.code)
+				// console.log(res.data.code)
 				if (noVerify)
 					reslove(res.data, res);
 				else if (res.data.status == 200)