商户拒绝

pages/admin/orderRefund/index.vue

@@ -134,11 +134,15 @@
 						})
 					}
 				}
+					
+				
 				let params = {
 					status: that.status,
 					fail_message: that.fail_message
 				}
-				if(that.orderInfo.refund_type == 2){
+				
+				
+				if(that.orderInfo.refund_type == 2 && that.status != -1){
 					if (!that.refundInfo.mer_delivery_user) {
 						return that.$util.Tips({
 							title: '请填写收货人姓名'

pages/short_video/components/douyin-scrollview/douyin-scrollview.nvue

@@ -21,8 +21,7 @@
 										<view class="like" @click="starComment(item)">
 											<image v-if="item.relevance_id" class="dianzan" src="../static/img/index/zan02.png"></image>
 											<image v-else class="dianzan" src="../static/img/index/zan01.png"></image>
-											{{222}}
+											
-				<text class="iconfont":class="itemn.relevance_id ? 'icon-yidianzan' : 'icon-dianzan1'"></text>
 											<text class="like-text">{{item.count_start}}</text>
 										</view>
 									</view>
@@ -39,8 +38,6 @@
 													<text class="time_two">{{itemn.create_time}}</text>
 												</view>
 												<text class="like_two" @click.stop="starComment(itemn)">
-													
-													{{444}}
 													<text class="iconfont":class="itemn.relevance_id ? 'icon-yidianzan' : 'icon-dianzan1'"></text>
 													{{itemn.count_start}}
 												</text>

static/iconfont/demo.css

@@ -16,11 +16,11 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-dianzan:before {
+.icon-dianzan2:before {
   content: "\e61f";
 }
 
-.icon-dianzan1:before {
+.icon-dianzan3:before {
   content: "\e601";
 }