Merge branch 'master' of http://git.cc-lotus.info/pointToNetwork/point-app

pagesHome/order/appraise.vue

@@ -183,6 +183,7 @@
 				padding: 2vw;
 
 				.text1 {
+					width: 65vw;
 					font-size: var(--font16Szie);
 				}
 

pagesHome/order/detail.vue

@@ -35,7 +35,7 @@
 								<view class="title">选择规格</view>
 								<text class="iconfont icon-jiantouyou"></text>
 							</view>
-							<view class="thr_1">
+							<view class="thr_1" @click="toAppraise(info)">
 								<view class="title">商品评价({{info.comment||0}})</view>
 								<text class="iconfont icon-jiantouyou"></text>
 							</view>
@@ -49,9 +49,9 @@
 								</view>
 							</view>
 							<view class="four_2">
-								<view class="grade">商品：<text>{{shop.goods_score||0}}</text></view>|
-								<view class="grade">发货：<text>{{shop.send_score||0}}</text></view>|
-								<view class="grade">服务：<text>{{shop.service_score||0}}</text></view>
+								<view class="grade">商品：<text>{{shop.goods_score||5}}</text></view>|
+								<view class="grade">发货：<text>{{shop.send_score||5}}</text></view>|
+								<view class="grade">服务：<text>{{shop.service_score||5}}</text></view>
 							</view>
 							<view class="four_2">
 								<view class="btn" @tap="toShop('pagesHome/shop/index')">进入店铺</view>

pagesMy/order/appraise.vue

@@ -9,8 +9,14 @@
 					<uni-forms-item label="上传评论图片" name="file">
 						<upload :list="file" name="file" :count="6" @uplSuc="uplSuc" @uplDel="uplDel"></upload>
 					</uni-forms-item>
-					<uni-forms-item label="等级" name="grade">
-						<uni-rate size="18" v-model="form.grade" @change="onChange" />
+					<uni-forms-item label="商品评分" name="goods_score">
+						<uni-rate size="18" v-model="form.goods_score" />
+					</uni-forms-item>
+					<uni-forms-item label="发货评分" name="send_score">
+						<uni-rate size="18" v-model="form.send_score" />
+					</uni-forms-item>
+					<uni-forms-item label="店铺评分" name="service_score">
+						<uni-rate size="18" v-model="form.service_score" />
 					</uni-forms-item>
 				</uni-forms>
 				<view class="btn">
@@ -68,10 +74,6 @@
 				let arr = data.filter((i, index) => index != e.data.index);
 				that.$set(that, `${e.name}`, arr)
 			},
-			// 等级改变
-			onChange(e) {
-				console.log(this.form.num);
-			},
 			// 提交保存
 			async onSubmit(ref) {
 				const that = this;

pagesMy/order/index.vue

@@ -56,16 +56,16 @@
 										<text>总价¥{{item.total_detail.goods_total}}</text>
 									</view>
 									<view class="btn">
-										<button class="toCancel" v-if="item.status=='0'" type="default" size="mini"
+										<button v-if="item.status=='0'" type="default" size="mini"
 											@tap.stop="toCancel(item)">取消订单</button>
 										<button class="toPay" v-if="item.status=='0'" type="default" size="mini"
 											@tap.stop="toPay(item)">付款</button>
-										<button class="toConfirm" v-if="item.status=='2'" type="default" size="mini"
+										<button v-if="item.status=='2'" type="default" size="mini"
 											@tap.stop="toConfirm(item)">确认收货</button>
-										<button class="toAfter" v-if="item.status!='0'" type="default" size="mini"
+										<button v-if="item.status!='0'" type="default" size="mini"
 											@tap.stop="toAfter(item)">申请售后</button>
-										<!-- <button class="toAppraise" v-if="item.status=='3'" type="default" size="mini"
-											@tap.stop="toAppraise(item)">立即评价</button> -->
+										<button v-if="item.status=='3'" type="default" size="mini"
+											@tap.stop="toAppraise(item)">立即评价</button>
 									</view>
 								</view>
 								<view class="list_2 list_3" v-for="(item,index) in list" :key="index"
@@ -114,18 +114,18 @@
 										<text>总价¥{{item.total_detail.goods_total}}</text>
 									</view>
 									<view class="btn">
-										<button class="toCancel" v-if="item.status=='2'||item.status=='3'"
-											type="default" size="mini" @tap.stop="toLogi(item)">查看物流</button>
-										<button class="toCancel" v-if="item.status=='0'" type="default" size="mini"
+										<button v-if="item.status=='2'||item.status=='3'" type="default" size="mini"
+											@tap.stop="toLogi(item)">查看物流</button>
+										<button v-if="item.status=='0'" type="default" size="mini"
 											@tap.stop="toCancel(item)">取消订单</button>
 										<button class="toPay" v-if="item.status=='0'" type="default" size="mini"
 											@tap.stop="toPay(item)">付款</button>
-										<button class="toConfirm" v-if="item.status=='2'" type="default" size="mini"
+										<button v-if="item.status=='2'" type="default" size="mini"
 											@tap.stop="toConfirm(item)">确认收货</button>
-										<button class="toAfter" v-if="item.status!='0'" type="default" size="mini"
+										<button v-if="item.status!='0'" type="default" size="mini"
 											@tap.stop="toAfter(item)">申请售后</button>
-									<!-- 	<button class="toAppraise" v-if="item.status=='3'" type="default" size="mini"
-											@tap.stop="toAppraise(item)">立即评价</button> -->
+										<button v-if="item.status=='3'" type="default" size="mini"
+											@tap.stop="toAppraise(item)">立即评价</button>
 									</view>
 								</view>
 							</view>