auto

center/addrForm.vue

@@ -143,7 +143,7 @@
 			submit() {
 				this.$refs.uForm.validate().then(res => {
 					console.log('this.model',this.model);
-					uni.$u.toast('校验通过')
+					// uni.$u.toast('校验通过')
 					if(this.saveType=='edit'){
 						this.editAddr()
 					}else{

center/center.vue

@@ -69,7 +69,7 @@
 				</view>
 			</view>
 		</u-overlay>
-		<tabbar :tabbarIndexProps="Number(3)" />
+		<tabbar :tabbarIndexProps="3" />
 	</view>
 </template>
 
@@ -116,7 +116,7 @@
 		},
 		methods: {
 			getMemberInfo(){
-				this.$u.api.memberInfo({id:this.vuex_user_info.userid}).then(res=>{
+				this.$u.api.memberInfo({id:this.vuex_member_info.id}).then(res=>{
 					this.memberInfo = res.data;
 					this.avatar =  res.data.avatar;
 					// console.log('memberInfo',this.memberInfo);

center/memberinfo.vue

@@ -27,7 +27,7 @@
 						></u-upload>
 					</view>
 				</view>
-				<u-cell title="昵称" :value="memberInfo.name"></u-cell>
+				<u-cell title="昵称" @click="nameShow=true" :value="memberInfo.name"></u-cell>
 				<u-cell title="性别" :value="memberInfo.sex|filterSex"></u-cell>
 				<u-cell title="生日" :value="memberInfo.birthdayTime||'未设置'" @click="timeShow = true" :isLink="true"></u-cell>
 				<u-cell title="会员等级" :value="memberInfo.levelName"></u-cell>
@@ -44,6 +44,17 @@
 				@cancel="timeShow = false"
 			></u-datetime-picker>
 		</view>
+		<u-modal :show="nameShow"  title="修改昵称" @confirm="changeName" @cancel="nameShow=false" :showCancelButton="true" >
+			<view class="slot-content">
+				<u--input
+				    placeholder="请输入内容"
+				    border="surround"
+				    v-model="tempName"
+					maxlength="8"
+				  >
+				</u--input>
+			</view>
+		</u-modal>
 	</view>
 </template>
 
@@ -55,6 +66,8 @@
 		},
 		data() {
 			return {
+				nameShow:false,
+				tempName:'',
 				uploadFileUrl:this.$commonConfig.uploadFileUrl,
 				timeShow:false,
 				birthday:'',
@@ -117,12 +130,26 @@
 					params.avatar = this.avatarUrl;
 				}else if(type == 'birthday'){
 					params.birthdayTime = this.birthday;
+				}else if(type == 'name'){
+					if(!this.tempName){
+						uni.showToast({
+							title:'请输入昵称',
+							icon:'error'
+						})
+						return
+					}
+					params.name = this.tempName;
 				}
 				this.$u.api.updateMemberInfo(params).then(res=>{
 					this.getMemberInfo();
+					this.nameShow = false;
 				}).catch(err=>{
 					console.log('err',err);
 				})
+			},
+			changeName(){
+				this.updateMemberInfo('name');
+				console.log('memberInfo',this.memberInfo);
 			}
 		}
 	}

common/apiurl.js

@@ -199,6 +199,11 @@ const apiurl = {
 		url: '/order/confirm',
 		type: 'post'
 	},
+	// 评价
+	addGoodsComment: {
+		url: '/order/addGoodsComment',
+		type: 'post'
+	},
 	// 订单查询物流
 	getDilevery: {
 		url: '/order/getDilevery',

manifest.json

@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx00de87c85a9a0a42",
+        "appid" : "wx5e05c74f1e18097d",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,
@@ -58,11 +58,11 @@
         },
         "usingComponents" : true,
         "permission" : {
-			"scope.userLocation": {
-				"desc": "你的位置信息将用于小程序位置接口的效果展示"
-			}
-		},
-		"requiredPrivateInfos": ["getLocation", "chooseLocation"]
+            "scope.userLocation" : {
+                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
+            }
+        },
+        "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ]
     },
     "mp-alipay" : {
         "usingComponents" : true

pages/login/login.vue

@@ -216,12 +216,12 @@
 				let _this = this;
 				this.$u.api.memberInfo({id:userid}).then(res=> {
 					if(res.code ===200) {
+						_this.userInfo = res.data;
 						this.$u.vuex('vuex_member_info', res.data);
 						this.$u.vuex('vuex_member_info.avatar', 'https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0');
 						this.$u.vuex('vuex_member_info.name', '微信用户');
-						uni.navigateTo({
-							url: '/pages/index/index'
-						})
+						this.updateMemberInfo();
+						
 						// 下面需要获取微信头像和昵称
 						// if(res.data.name){
 						// 	_this.hasUserInfo = true;
@@ -238,6 +238,20 @@
 					}
 				})
 			},
+			updateMemberInfo(){
+				let params ={
+					id:this.userInfo.id,
+					avatar:'https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0',
+					name:'微信用户'
+				};
+				this.$u.api.updateMemberInfo(params).then(res=>{
+					uni.navigateTo({
+						url: '/pages/index/index'
+					})
+				}).catch(err=>{
+					console.log('err',err);
+				})
+			},
 			authUser(){
 				let userInfo = this.vuex_user_info || {};
 				// console.log('this===',this);

shopping/distribution.vue

@@ -12,7 +12,7 @@
 
 		<view class="base-info page-wrap">
 			<view class="company base-item u-flex"  v-if="details.logisticsNum">
-				<u--image :showLoading="false" :src="companylogo" width="60rpx" height="60rpx"></u--image>
+				<!-- <u--image :showLoading="false" :src="companylogo" width="60rpx" height="60rpx"></u--image> -->
 				<text>{{details.logisticsCompany}}：{{details.logisticsNum}}</text>
 			</view>
 			<view class="orderNo base-item">订单号：{{details.orderNum}}</view>
@@ -22,7 +22,7 @@
 			<u-steps current="0" activeColor="#00A447" dot direction="column">
 				<u-steps-item 
 					v-for="(item,index) in details.dileveryList" :key="index"
-					:title="item.reason" 
+					:title="item.reason + dileveryStatus(item.status)" 
 					:desc="item.time">
 				</u-steps-item>
 				<!-- <u-steps-item title="已出库" desc="10:35"></u-steps-item> -->
@@ -48,6 +48,15 @@
 				companylogo:'',
 			}
 		},
+		computed:{
+			dileveryStatus(){
+				return function(value){
+					let dileveryList = ['下单', '揽件', '运输中', '派件中', '签收', '退回', '拒签']
+					return ''
+					return '-' + dileveryList[value]
+				}
+			}
+		},
 		onLoad(page) {
 			this.orderId = page.orderId;
 			this.getDilevery();
@@ -70,6 +79,7 @@
 			getDilevery(){
 				this.$u.api.getDilevery({orderId:this.orderId}).then(res=>{
 					this.details = res.data;
+					this.details.dileveryList = res.data.dileveryList.reverse();
 					console.log('res',res.data);
 				}).catch(err=>{
 					console.log('getDilevery',err);

shopping/evaluate.vue

@@ -25,10 +25,10 @@
 		</view>
 		<view class="rate-wrap u-flex">
 			<text class="rate-title">商品评价</text>
-			<u-rate count="5" v-model="params.rate"  active-color="#FFBE00" size="20"></u-rate>
-			<text class="rate-text">{{params.rate|rateText}}</text>
+			<u-rate count="5" v-model="params.star"  active-color="#FFBE00" size="20"></u-rate>
+			<text class="rate-text">{{params.star|rateText}}</text>
 		</view>
-		<u--textarea v-model="params.content" height="200rpx" maxlength="200" placeholder="如实描述商品和使用感受，更受欢迎" ></u--textarea>
+		<u--textarea v-model="params.contentText" height="200rpx" maxlength="200" placeholder="如实描述商品和使用感受，更受欢迎" ></u--textarea>
 		<view class="upload-wrap">
 			<u-upload
 				 width="140rpx"
@@ -39,7 +39,7 @@
 				:previewImage="true"
 				multiple
 			    name="name"
-			    :maxCount="9"
+			    :maxCount="5"
 			></u-upload>
 		</view>
 		<view class="full-btn" @click="submit">提交评价</view>
@@ -53,9 +53,10 @@
 			return {
 				id:'',
 				params:{
-					rate:3,
-					content:'',
-					imgs:[]
+					orderId:'',
+					star:5,
+					contentText:'',
+					contentImgList:[]
 				},
 				fileList:[],
 				orderDetails:{},
@@ -66,8 +67,8 @@
 		},
 		onLoad(page) {
 			console.log('page',page);
-			this.id = page.id;
-			this.getOrderDetails(this.id)
+			this.params.orderId = page.id;
+			this.getOrderDetails(this.params.orderId)
 		},
 		methods: {
 			getOrderDetails(id){
@@ -95,10 +96,21 @@
 				this.fileList.splice(event.index, 1)
 			},
 			submit(){
-				this.params.imgs = this.fileList.map(item =>{
+				this.params.contentImgList = this.fileList.map(item =>{
 					if(item.message=='成功'){
 						return item.url.url
 					}
+				});
+				this.$u.api.addGoodsComment(this.params).then(res=>{
+					console.log('res',res.data);
+					uni.showToast({
+						title:res.msg,
+						complete() {
+							uni.navigateBack()
+						}
+					});
+				}).catch(err=>{
+					console.log('addGoodsComment',err);
 				})
 				console.log('params',this.params);
 			}

shopping/order.vue

@@ -78,7 +78,7 @@
 				tabsList:[
 					{name:'全部',status:'',},
 					{name:'待付款',status:'0',},
-					{name:'待发货',status:'1',},
+					{name:'待出库',status:'1',},
 					{name:'待收货',status:'2'},
 					{name:'待评价',status:'3'},
 					{name:'退款/售后',status:'7'}

utils/filter.js

@@ -94,8 +94,8 @@ Vue.filter("filterDilevery", function(val) {
 
 // 退款状态
 Vue.filter("filterRefundState", function(val) {	
-	let dileveryList = ['申请中', '退款成功', '退款失败', '退款中']
-	return dileveryList[val]
+	let rundStateList = ['申请中', '退款成功', '退款失败', '退款中']
+	return rundStateList[val]
 });
 
 // 评分文字

utils/index.js

@@ -29,3 +29,9 @@ export function timeStamp(obj, interval) {
 	let eDate = interval*60*1000
 	return ((sDate + eDate) - new Date().getTime())/1000
 }
+
+// 保留两位小数，自动补充零
+function dileveryStatus(value) {
+	let dileveryList = ['下单', '揽件', '运输中', '派件中', '签收', '退回', '拒签']
+	return dileveryList[val]
+}

xushuo/xushuo.vue

@@ -75,7 +75,7 @@
 					</view>
 				</view>
 			</view>
-			<tabbar :tabbarIndexProps='Number(2)' />
+			<tabbar :tabbarIndexProps='2' />
 		</view>
 	</view>
 </template>