Merge branch 'developerB' of git.caimei365.com:caimei-repository/caimei-applets-caimei into developerB

second/pages/product/product-list.vue

@@ -53,7 +53,7 @@
 		                    </a>
 		                    <view class="targetprice" >
 		                        <span v-if="item.detailTalkFlag ==2 && hasLogin==false">价格详聊</span>
-		                        <span v-else-if="hasLogin==false" class="priceparam">登录查看价格></span>
+		                        <span v-else-if="hasLogin==false" class="priceparam">登录查看价格</span>
 		                        <span v-else-if="hasLogin && item.detailTalkFlag==2">价格详聊</span>
 		                        <span v-else>￥{{item.price1Str}}</span>
 		                    </view>

seller/pages/order/order-details.vue

@@ -24,7 +24,7 @@
 			<payment-record ref="payment" v-if="isRequest" :discernReceiptList="discernReceiptList" :receiptAmount="receiptAmount"></payment-record>
 			<!-- 退款记录 -->
 			<refund-record ref="refund" v-if="isRequest" :returnedPurchaseList="returnedPurchaseList" :returnedPurchaseFee="returnedPurchaseFee"></refund-record>
-			<view class="clause" @tap.stop="openclauseConten(clauseData.id)" :class="clauseData.name=='无条款'?'noclick':''">
+			<view class="clause" @click="openclauseConten(clauseData.id)" :class="clauseData.name=='无条款'?'noclick':''">
 				售后条款：<label class="text" :class="clauseData.name=='无条款'?'color-bg':''">{{clauseData.name}}</label>
 			</view>
 			<!-- 底部button -->

supplier/pages/user/information.vue

@@ -976,6 +976,9 @@
 		 width: 36rpx; 
 		 height: 36rpx;
 	 }
+	 radio .wx-radio-input.wx-radio-input-checked::before{
+		 font-size:28rpx; 
+	 }
 	 checkbox .wx-checkbox-input{
 	   border-radius: 50%;
 	   width: 36rpx; 
@@ -984,17 +987,17 @@
 	 /* 选中后的 背景样式 */
 	 checkbox .wx-checkbox-input.wx-checkbox-input-checked{
 	   background: #E15616;
+	   border: 2rpx solid #e15616;
 	 }
 	 checkbox .wx-checkbox-input.wx-checkbox-input-checked::before{
 	   border-radius: 50%;
-	    border: 2rpx solid #e15616;
 	   width: 36rpx;
 	   height: 36rpx;
 	   line-height: 36rpx;
 	   text-align: center;
-	   font-size:24rpx; 
+	   font-size:20rpx; 
 	   color:#fff;
-	   background: transparent;
+	   // background: transparent;
 	   transform:translate(-50%, -50%) scale(1);
 	   -webkit-transform:translate(-50%, -50%) scale(1);
 	 }