zs 2 years ago
parent
commit
91a3ae2a93
4 changed files with 128 additions and 106 deletions
  1. 99 94
      common/api.js
  2. 9 5
      components/discount/index.vue
  3. 9 2
      pagesHome/order/appraise.vue
  4. 11 5
      pagesMy/order/index.vue

+ 99 - 94
common/api.js

@@ -1,108 +1,113 @@
 import config from '../config.js';
 const getDomain = (uri, method, type) => {
-  let wx_env = config.wx_miniProgram;
-  let system = config.system;
-  let url = config.serverUrl;
-  if (type && type == 'file') return url + `/files` + uri;
-  if (type && type == 'integral') return url + `/point/zr/v1/api` + uri;
-  if (uri.startsWith('/wechat/api')) return url + uri;
-  else {
-    if (system.uniPlatform == 'app') {
-      return url + `/point/v1/api` + uri;
-    } else if (system.uniPlatform == 'mp-weixin') {
-      if (wx_env.envVersion == 'develop' || wx_env.envVersion == 'trial') {
-        return url + `${config.wx_dev}/point/v1/api` + uri;
-      } else if (wx_env.envVersion == 'release') {
-        return url + '/point/v1/api' + uri;
-      }
-    }
-  }
+	let wx_env = config.wx_miniProgram;
+	let system = config.system;
+	let url = config.serverUrl;
+	if (type && type == 'file') return url + `/files` + uri;
+	if (type && type == 'integral') return url + `/point/zr/v1/api` + uri;
+	if (uri.startsWith('/wechat/api')) return url + uri;
+	else {
+		if (system.uniPlatform == 'app') {
+			return url + `/point/v1/api` + uri;
+		} else if (system.uniPlatform == 'mp-weixin') {
+			if (wx_env.envVersion == 'develop' || wx_env.envVersion == 'trial') {
+				return url + `${config.wx_dev}/point/v1/api` + uri;
+			} else if (wx_env.envVersion == 'release') {
+				return url + '/point/v1/api' + uri;
+			}
+		}
+	}
 };
 // 获取token
 const getToken = () => {
-  try {
-    const value = uni.getStorageSync('token');
-    if (value) return value;
-  } catch {}
+	try {
+		const value = uni.getStorageSync('token');
+		if (value) return value;
+	} catch {}
 };
 // 获取请求key
 const getRequestKey = (views) => {
-  let baseUrl = getDomain('/util/crk');
-  return new Promise((resolve, reject) => {
-    uni.request({
-      url: baseUrl,
-      method: 'POST',
-      header: { views },
-      success: (res) => {
-        if (res.data && res.data.data) resolve(res.data.data);
-        else reject();
-      },
-      fail: (err) => {
-        console.error(err)
-        reject(err);
-      },
-    });
-  });
+	let baseUrl = getDomain('/util/crk');
+	return new Promise((resolve, reject) => {
+		uni.request({
+			url: baseUrl,
+			method: 'POST',
+			header: {
+				views
+			},
+			success: (res) => {
+				if (res.data && res.data.data) resolve(res.data.data);
+				else reject();
+			},
+			fail: (err) => {
+				console.error(err)
+				reject(err);
+			},
+		});
+	});
 };
 
 export const requestBase = async (uri, method = 'GET', data, type) => {
-  let baseUrl = getDomain(uri, method, type);
-  let token = getToken();
-  let header = {};
-  let views = JSON.stringify({ uri, method, data });
-  views = encodeURIComponent(views)
-  if (method !== 'GET') {
-    let rk = await getRequestKey(views);
-    header.rk = rk;
-    header.views = views;
-  }
-  if (token) header.token = token;
-  return new Promise((resolve, reject) => {
-    uni.request({
-      url: baseUrl,
-      method: method || 'GET',
-      data: data || {},
-      header,
-      success: (res) => {
-        resolve(res.data);
-      },
-      fail: (err) => {
-        console.log(err);
-        uni.showToast({
-          title: '请求接口失败',
-          icon: 'fail',
-        });
-        reject(err.data);
-      },
-    });
-  });
+	let baseUrl = getDomain(uri, method, type);
+	let token = getToken();
+	let header = {};
+	let views = JSON.stringify({
+		uri,
+		method
+	});
+	views = encodeURIComponent(views)
+	if (method !== 'GET') {
+		let rk = await getRequestKey(views);
+		header.rk = rk;
+		header.views = views;
+	}
+	if (token) header.token = token;
+	return new Promise((resolve, reject) => {
+		uni.request({
+			url: baseUrl,
+			method: method || 'GET',
+			data: data || {},
+			header,
+			success: (res) => {
+				resolve(res.data);
+			},
+			fail: (err) => {
+				console.log(err);
+				uni.showToast({
+					title: '请求接口失败',
+					icon: 'fail',
+				});
+				reject(err.data);
+			},
+		});
+	});
 };
 export const requestFile = (uri, method, data, type) => {
-  let baseUrl = getDomain(uri, method, type);
-  return new Promise((resolve, reject) => {
-    uni.uploadFile({
-      url: baseUrl,
-      filePath: data,
-      name: method || 'file',
-      formData: {},
-      success: (res) => {
-        let data = JSON.parse(res.data);
-        if (data.errcode != '0') {
-          return uni.showToast({
-            title: data.errmsg,
-            icon: 'error',
-          });
-        }
-        resolve(data);
-      },
-      fail: (err) => {
-        let data = JSON.parse(err.data);
-        uni.showToast({
-          title: '请求接口失败',
-          icon: 'fail',
-        });
-        reject(data);
-      },
-    });
-  });
+	let baseUrl = getDomain(uri, method, type);
+	return new Promise((resolve, reject) => {
+		uni.uploadFile({
+			url: baseUrl,
+			filePath: data,
+			name: method || 'file',
+			formData: {},
+			success: (res) => {
+				let data = JSON.parse(res.data);
+				if (data.errcode != '0') {
+					return uni.showToast({
+						title: data.errmsg,
+						icon: 'error',
+					});
+				}
+				resolve(data);
+			},
+			fail: (err) => {
+				let data = JSON.parse(err.data);
+				uni.showToast({
+					title: '请求接口失败',
+					icon: 'fail',
+				});
+				reject(data);
+			},
+		});
+	});
 };

+ 9 - 5
components/discount/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="discount">
-		<view class="pre_one">优惠劵({{total}}张)</view>
+		<view class="pre_one">优惠劵({{total||couponList.length}}张)</view>
 		<view class="pre_two">
 			<view class="list" v-for="(item,index) in couponList" :key="index">
 				<view class="l">
@@ -12,7 +12,8 @@
 					<view class="l_2" v-else-if="item.discount_type=='discount'">
 						<view class="money">{{item.discount_config.min||'0'}}折</view>
 						<view v-if="item.discount_config.limit=='nolimit'" class="man">不限</view>
-						<view v-else class="man">满{{item.discount_config.limit||'0'}}可用,最多减{{item.discount_config.max||'0'}}元
+						<view v-else class="man">
+							满{{item.discount_config.limit||'0'}}可用,最多减{{item.discount_config.max||'0'}}元
 						</view>
 					</view>
 				</view>
@@ -30,9 +31,12 @@
 					</view>
 				</view>
 				<view class="r">
-					<button v-if="Style&&Style.btn||false" type="default" size="mini" @click="toDiscount(item)">确认</button>
-					<button v-if="Style&&Style.status||false" type="default" size="mini">{{item.status=='0'?'未使用':item.status=='1'?'已使用':'已过期'}}</button>
-					<button v-if="Style&&Style.receive==true&&item.canGet==true" type="default" size="mini" @click="toReceive(item)">领取</button>
+					<button v-if="Style&&Style.btn||false" type="default" size="mini"
+						@click="toDiscount(item)">确认</button>
+					<button v-if="Style&&Style.status||false" type="default"
+						size="mini">{{item.status=='0'?'未使用':item.status=='1'?'已使用':'已过期'}}</button>
+					<button v-if="Style&&Style.receive==true&&item.canGet==true" type="default" size="mini"
+						@click="toReceive(item)">领取</button>
 				</view>
 			</view>
 		</view>

+ 9 - 2
pagesHome/order/appraise.vue

@@ -16,7 +16,9 @@
 				<scroll-view scroll-y="true" class="scroll-view">
 					<view class="list-scroll-view">
 						<view class="list" v-for="(item, index) in list" :key="index">
-							<image v-if="item.customer.icon&&item.customer.icon.length>0" class="image" :src="item.customer.icon&&item.customer.icon.length>0?item.customer.icon[0].url:''" mode="">
+							<image v-if="item.customer.icon&&item.customer.icon.length>0" class="image"
+								:src="item.customer.icon&&item.customer.icon.length>0?item.customer.icon[0].url:''"
+								mode="">
 							</image>
 							<text v-else class="iconfont icon-top"></text>
 							<view class="list_1">
@@ -43,7 +45,9 @@
 										</view>
 										<view v-if="item.customer._id==user._id" @tap="toReply(item,indexx)">回复</view>
 									</view>
-									<uni-easyinput v-if="reply.reply&&reply.customer._id==user._id&&reply._id==item._id&&reply.index==indexx" class="input" maxlength=-1 type="textarea" @change="confirm" placeholder="评论" />
+									<uni-easyinput
+										v-if="reply.reply&&reply.customer._id==user._id&&reply._id==item._id&&reply.index==indexx"
+										class="input" maxlength=-1 type="textarea" @change="confirm" placeholder="评论" />
 								</view>
 							</view>
 						</view>
@@ -100,6 +104,9 @@
 		onLoad: function(e) {
 			const that = this;
 			that.$set(that, `id`, e.id || '');
+		},
+		onShow: function(e) {
+			const that = this;
 			that.watchLogin()
 		},
 		methods: {

+ 11 - 5
pagesMy/order/index.vue

@@ -2,7 +2,7 @@
 	<mobile-frame>
 		<view class="main">
 			<view class="one">
-				<input type="text" v-model="searchInfo.name" @input="toInput" placeholder="搜索商品">
+				<input type="text" v-model="searchInfo.goods" @input="toInput" placeholder="搜索商品">
 			</view>
 			<view class="two">
 				<tabs :tabs="tabs" @tabsChange="tabsChange">
@@ -54,8 +54,8 @@
 											</view>
 										</view>
 										<view class="other">
-											<text>共{{item.total_detail.freight_total}}件商品</text>
-											<text>总价¥{{item.total_detail.goods_total}}</text>
+											<text>共{{item.buy_num_total}}件商品</text>
+											<text>实付款¥{{item.real_pay}}</text>
 										</view>
 									</view>
 									<view class="list_2" v-else>
@@ -96,7 +96,7 @@
 										</view>
 										<view class="other">
 											<text>共{{item.buy_num_total||0}}件商品</text>
-											<text>总价¥{{item.real_pay}}</text>
+											<text>实付款¥{{item.real_pay}}</text>
 										</view>
 									</view>
 									<view class="btn">
@@ -279,7 +279,13 @@
 			// 输入框
 			toInput(e) {
 				const that = this;
-				that.$set(that.searchInfo, `name`, e.detail.value)
+				if (that.searchInfo.goods) {
+					that.$set(that.searchInfo, `goods`, e.detail.value)
+				} else {
+					that.$set(that, `searchInfo`, {})
+				}
+				that.clearPage();
+				that.search();
 			},
 			// 订单详细信息
 			toInfo(item) {