Merge branch 'qiantengteng' of ssh://git.9026.com:2212/xiansin/shop4.3.57 into qiantengteng

components/page-component/app-associated-link/app-associated-link.vue

@@ -168,7 +168,7 @@
             font-size: 30rpx;
             height: 60rpx;
             margin-right: 20rpx;
-            background: #F61921;
+            background: #F84469;
         }
 		.app-icon {
 			background-image: url("../../../static/image/icon/arrow-right-white.png");

components/page-component/app-comments/app-comments.vue

@@ -23,7 +23,7 @@
                     <view class="more box-grow-0">{{item.time}}</view>
                 </view>
                 <view class="c-attr-name">{{ item.attr_name }}</view>
-                <view :class="showType === 'detail' ? 'content' : ''">{{item.content}}</view>
+                <view style="font-size: 26rpx;" :class="showType === 'detail' ? 'content' : ''">{{item.content}}</view>
                 <view class="dir-left-wrap pic-list">
                     <image :src="pic_url" v-for="(pic_url,pic_url_index) in item.pic_url" :key="pic_url_index"
                            @click="imgPreview(index, pic_url_index)"></image>
@@ -176,7 +176,8 @@
 
 
         .more {
-            font-size: $uni-font-size-weak-one;
+            // font-size: $uni-font-size-weak-one;
+			font-size: 21rpx;
             color: $uni-general-color-two;
         }
 

components/page-component/app-share-qr-code-poster/app-share-qr-code-poster.vue

@@ -273,6 +273,7 @@
 	    }
         .app-icons {
             height: #{290rpx};
+			background-color: #fff;
 	        .app-text {
 		        font-size: #{26rpx};
 		        color: #353535;
@@ -286,15 +287,15 @@
                     background-size: cover;
                     background-repeat: no-repeat;
                     background-color: white;
-                    border-radius: 50%;
+                    // border-radius: 50%;
                     margin-top: #{60rpx};
                     margin-bottom: #{24rpx};
                 }
                 .app-share {
-                    background-image: url('../../../static/image/icon/share.png');
+                    background-image: url('https://qiantengteng.9026.com/web/statics/img/mall/share1.png');
                 }
                 .app-code {
-                    background-image: url('../../../static/image/icon/code.png');
+                    background-image: url('https://qiantengteng.9026.com/web/statics/img/mall/share2.png');
                 }
                 .text {
                     font-size: #{26rpx};

components/page-component/goods/app-goods-banner.vue

@@ -64,7 +64,7 @@
 
         <view>
             <app-jump-button url="/pages/cart/cart" v-if="isCart">
-                <view class="cart" v-bind:style="{'top': isScanQrCode ? '250rpx' : '60rpx'}">
+                <view class="cart" v-bind:style="{'top': isScanQrCode ? '250rpx' : '176rpx'}">
                     <image load-lazy src="../../../static/image/icon/nav-icon-cart.png"></image>
                 </view>
             </app-jump-button>

components/page-component/goods/bd-comments.vue

@@ -118,7 +118,9 @@ export default {
         margin-left: 15upx;
     }
     .bd-name {
-        font-size: 28upx;
+        /* font-size: 28upx; */
+		font-size: 34rpx;
+		font-weight: bold;
         color: #333;
     }
     .bd-more {

components/page-component/goods/bd-detail.vue

@@ -65,7 +65,7 @@ export default {
         color: $uni-general-color-two;
         .text {
             color: #333;
-            font-size: #{36rpx};
+            font-size: #{30rpx};
         }
         .border {
             border-top: 2px solid #E56283;

components/page-component/goods/bd-info.vue

@@ -54,7 +54,7 @@
                 </view>
                 <view class="bd-tag">
                     <image src="../../../static/image/icon/icon-tui.png" style="width: 34rpx;"></image>
-                    <text>退换无忧</text>
+                    <text>售后无忧</text>
                 </view>
             </div>
             <block v-if="isShowShare" >
@@ -278,13 +278,13 @@
         margin-left: 12upx;
     }
     .bd-price {
-        font-size: 56upx;
+        font-size: 44upx;
         line-height: 1;
         font-family: DIN;
     }
     .bd-sales {
         color: #999999;
-        font-size: 32rpx;
+        font-size: 24rpx;
         float: right;
     }
     .bd-member-price {
@@ -296,7 +296,7 @@
         text-decoration: line-through;
         margin-left: 20upx;
         color: #999999;
-        font-size: 28upx;
+        font-size: 26upx;
     }
     .bd-tags{
         width: 100%;

pages/goods/goods.vue

@@ -41,7 +41,7 @@
             ></bd-info>
 			<view class="join-member" v-if="goods.level_show === 2">
 			    <view class="bd-vip" @click="goToMember">
-			        <image style="height: 78rpx;width: 100%;" src="/static/image/addvip.png" alt="">
+			        <image style="height: 72rpx;width: 100%;" src="/static/image/addvip.png" alt="">
 			    </view>
 				<!--<app-join-member
 			        v-bind:member-min-price="`${detail.group_min_member_price}`"

pages/search/search.vue

@@ -47,7 +47,7 @@
                                         <view v-if="item.mark && temp_index === 1"
                                               class="box-grow-0 close-pic cross-center"
                                               @click="selectAllList">
-                                            <image src="./image/icon_open.png"></image>
+                                            <image src="/static/image/icon_open.png"></image>
                                         </view>
                                     </view>
                                 </view>
@@ -56,14 +56,14 @@
                     </view>
                     <!-- 热搜 -->
                     <view class="hot-center" v-if="getSetting.is_show_hot_goods == 1">
-                        <image class="top-image" src="./image/icon_top.png"></image>
+                        <image class="top-image" src="/static/image/icon_top.png"></image>
                         <view class="top-list" v-if="hotGoodsList && hotGoodsList.length">
                             <view v-for="(goods,index) in hotGoodsList" :key="index"
                                   class="item cross-center dir-left-nowrap"
                                   @click="goodsNav(goods.url)">
                                 <view class="box-grow-0 main-center first">
-                                    <image v-if="goods.sort < 4" :src="goods.sort === 1 ? './image/list_icon_first.png' :
-                                    goods.sort === 2 ? './image/list_icon_second.png' : './image/list_cion_third.png'"></image>
+                                    <image v-if="goods.sort < 4" :src="goods.sort === 1 ? '/static/image/list_icon_first.png' :
+                                    goods.sort === 2 ? '/static/image/list_icon_second.png' : '/static/image/list_cion_third.png'"></image>
                                     <view v-if="goods.sort > 3">{{goods.sort}}</view>
                                 </view>
                                 <view class="goods-image box-grow-0">

pages/share/level/level.vue

@@ -1,7 +1,8 @@
 <template>
     <view class="app-layout">
         <app-layout>
-            <view class="app-level" :style="bg" v-if="list">
+			<!-- :style="bg" -->
+            <view class="app-level"  style="background-image: url('https://qiantengteng.9026.com/web/statics/img/mall/bg.png');"  v-if="list">
                 <!--<view class="title" v-if="list.length > 0">
                     {{list.length > 1 ? (list.length == 2 ? '两' : '三') + '者满足其一即可升级' : '满足以下条件即可升级'}}
                 </view>-->

plugins/advance/components/detail-ad.vue

@@ -5,7 +5,7 @@
 			<view class="price">
 				<view class="current">
 					￥{{detail.price_min === detail.price_max?detail.price_min:`${detail.price_min}~${detail.price_max}`}}
-					<text>历史最低</text>
+					<text>感恩回馈</text>
 				</view>
 				<view class="original">￥{{detail.original_price}}</view>
 			</view>

plugins/advance/components/detail-price-share.vue

@@ -14,7 +14,7 @@
                 </view>
                 <view class="bd-tag">
                     <image src="../../../static/image/icon/icon-tui.png" style="width: 34rpx;"></image>
-                    <text>退换无忧</text>
+                    <text>售后无忧</text>
                 </view>
             </div>
             <view class="bd-tag bd-tag-share" @click="share_show" style="background: #ff3366">

plugins/advance/detail/detail.vue

@@ -56,7 +56,7 @@
             <!--商品会员-->
 			<view class="join-member" v-if="detail.level_show === 2">
                 <view class="bd-vip" @click="goToMember">
-                    <image src="/static/image/addvip.png" alt="">
+                    <image style="height: 72rpx; width: 100%;" src="/static/image/addvip.png" alt="">
                 </view>
 				<!--<app-join-member
                     v-bind:member-min-price="`${detail.group_min_member_price}`"
@@ -478,7 +478,7 @@
 
 	.join-member {
 		background-color: #ffffff;
-		padding: 0 #{24rpx};
+		padding: 0 #{30rpx};
 	}
 	.border-top {
 		border-top: #{1rpx} solid #e2e2e2;

plugins/bonus/index/index.vue

@@ -592,7 +592,7 @@
         width: #{702rpx};
         margin: 0 auto;
         border-radius: #{40rpx};
-        background-color: #ff4544;
+        background-color: #ff6699;
         color: #fff;
         font-size: #{32rpx};
         text-align: center;
@@ -849,8 +849,8 @@
         width: #{96rpx};
         line-height: #{46rpx};
         border-radius: #{24rpx};
-        border: #{1rpx} solid #ff4544;
-        color: #ff4544;
+        border: #{1rpx} solid #ff6699;
+        color: #ff6699;
         font-size: #{24rpx};
         text-align: center;
         margin-top: #{14rpx};
@@ -944,7 +944,7 @@
         height: #{100rpx};
         text-align: center;
         line-height: #{100rpx};
-        background-color: #ff4544;
+        background-color: #ff6699;
         color: #fff;
         font-size: #{30rpx};
         border-bottom-right-radius: #{20rpx};
@@ -955,6 +955,6 @@
         height: #{200rpx};
         width: #{200rpx};
     }.check-red {
-        background: #ff4544;
+        background: #ff6699;
          }
 </style>

plugins/miaosha/components/app-goods-time.vue

@@ -5,7 +5,7 @@
 			<view class="price">
 				<view class="current">
 					￥{{item.price}}
-					<text>历史最低</text>
+					<text>感恩回馈</text>
 				</view>
 				<view class="original">￥{{item.original_price}}</view>
 			</view>

plugins/miaosha/goods/goods.vue

@@ -18,7 +18,7 @@
 			</bd-info>
 			<view class="join-member" v-if="detail.level_show === 2">
 				<view class="bd-vip" @click="goToMember">
-					<image style="height: 78rpx;width: 100%;" src="/static/image/addvip.png" alt="">
+					<image style="height: 72rpx;width: 100%;" src="/static/image/addvip.png" alt="">
 				</view>
 				<!--<app-join-member
 			        v-bind:member-min-price="`${detail.group_min_member_price}`"

plugins/pt/components/app-pt-time.vue

@@ -5,7 +5,7 @@
 			<view class="price">
 				<view class="current">
 					￥{{item.price}}
-					<text>历史最低</text>
+					<text>感恩回馈</text>
 				</view>
 				<view class="original">￥{{item.original_price}}</view>
 			</view>

plugins/pt/goods/goods.vue

@@ -57,7 +57,7 @@
             </bd-info>
 			<view class="join-member" v-if="detail.level_show === 2">
 			    <view class="bd-vip" @click="goToMember">
-			        <image style="height: 78rpx;width: 100%;" src="/static/image/addvip.png" alt="">
+			        <image style="height: 72rpx;width: 100%;" src="/static/image/addvip.png" alt="">
 			    </view>
 				<!--<app-join-member
 			        v-bind:member-min-price="`${detail.group_min_member_price}`"