From 01e2940839082f75f6d96052b208ca0ac8c41e05 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Fri, 11 Sep 2020 11:26:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E9=99=A4=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E4=B8=8D=E8=A7=84=E8=8C=83=E7=9A=84=E5=9C=B0=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/style.less                         |  4 +--
 components/Menu.vue                           |  4 +--
 .../{ShoproLiveCard.vue => ShopLiveCard.vue}  | 18 ++++++------
 components/sh-adv.vue                         |  6 ++--
 pages/activity/DargainDetails/index.vue       |  2 +-
 pages/activity/GoodsGroup/index.vue           |  6 ++--
 pages/home/components/Banner.vue              |  2 +-
 pages/home/components/Live.vue                | 29 +++++++------------
 pages/home/index.vue                          |  2 +-
 pages/shop/Live/LiveList/index.vue            |  6 ++--
 pages/user/promotion/UserPromotion/index.vue  |  1 -
 11 files changed, 36 insertions(+), 44 deletions(-)
 rename components/{ShoproLiveCard.vue => ShopLiveCard.vue} (88%)

diff --git a/assets/css/style.less b/assets/css/style.less
index ff21dad..4d7c31d 100644
--- a/assets/css/style.less
+++ b/assets/css/style.less
@@ -4454,7 +4454,7 @@ page {
 }
 
 .bargain .header .time {
-  background-image: url('https://h5.yixiang.co/static/images/time.png');
+  //background-image: url('https://h5.yixiang.co/static/images/time.png');
   background-repeat: no-repeat;
   background-size: 100% 100%;
   width: 4.4*100rpx;
@@ -4596,7 +4596,7 @@ page {
 .bargain .wrapper .lock,
 .bargain .bargainGang .lock,
 .bargain .goodsDetails .lock {
-  background-image: url('https://h5.yixiang.co/static/images/lock.png');
+  //background-image: url('https://h5.yixiang.co/static/images/lock.png');
   background-repeat: no-repeat;
   background-size: 100% 100%;
   width: 5.48*100rpx;
diff --git a/components/Menu.vue b/components/Menu.vue
index 998b82d..e64690d 100644
--- a/components/Menu.vue
+++ b/components/Menu.vue
@@ -13,8 +13,8 @@
 			<swiper-item class="menu-swiper-item" v-for="(itemList, index) in carousel" :key="index" :style="list.length <= menu ? `height:200rpx` : `height:340rpx`">
 				<view class="menu-tab-box">
 					<view class="tab-list y-f" :style="{ width: 690 / menu + 'rpx' }" v-for="item in itemList" :key="item.name" @tap="routerTo(item)">
-						<image class="tab-img shopro-selector-circular" :style="{ width: imgW + 'rpx', height: imgW + 'rpx' }" :src="item.pic"></image>
-						<text class="shopro-selector-rect">{{ item.name }}</text>
+						<image class="tab-img Shop-selector-circular" :style="{ width: imgW + 'rpx', height: imgW + 'rpx' }" :src="item.pic"></image>
+						<text class="Shop-selector-rect">{{ item.name }}</text>
 					</view>
 				</view>
 			</swiper-item>
diff --git a/components/ShoproLiveCard.vue b/components/ShopLiveCard.vue
similarity index 88%
rename from components/ShoproLiveCard.vue
rename to components/ShopLiveCard.vue
index 5b869e5..1cc4236 100644
--- a/components/ShoproLiveCard.vue
+++ b/components/ShopLiveCard.vue
@@ -7,7 +7,7 @@
 				<text class="status-text">{{ liveStatus[detail.liveStatus].title }}</text>
 			</view>
 			<view class="item-title" :style="{ width: wh + 'rpx' }">{{ detail.name }}</view>
-			<!-- 	<image v-if="detail.liveStatus == 101" class="like-img" src="http://shopro.7wpp.com/imgs/live/zan.gif" mode=""></image> -->
+			<!-- 	<image v-if="detail.liveStatus == 101" class="like-img" src="http://Shop.7wpp.com/imgs/live/zan.gif" mode=""></image> -->
 		</view>
 		<view class="live-bottom" :style="{ width: wh + 'rpx' }">
 			<view class="live-info">
@@ -44,37 +44,37 @@
 	//  #endif
 	let timer = null;
 	export default {
-		name: 'shoproLiveCard',
+		name: 'shopLiveCard',
 		components: {},
 		data() {
 			return {
 				liveStatus: {
 					'101': {
-						img: 'http://shopro.7wpp.com/imgs/live/live.png',
+						img: 'https://wx.yixiang.co/static/images/live.png',
 						title: '直播中'
 					},
 					'102': {
-						img: 'http://shopro.7wpp.com/imgs/live/prevue.png',
+						img: 'https://wx.yixiang.co/static/images/prevue.png',
 						title: '未开始'
 					},
 					'103': {
-						img: 'http://shopro.7wpp.com/imgs/live/playback.png',
+						img: 'https://wx.yixiang.co/static/images/playback.png',
 						title: '已结束'
 					},
 					'104': {
-						img: 'http://shopro.7wpp.com/imgs/live/104.png',
+						img: 'https://wx.yixiang.co/static/images/104.png',
 						title: '禁播'
 					},
 					'105': {
-						img: 'http://shopro.7wpp.com/imgs/live/105.png',
+						img: 'https://wx.yixiang.co/static/images/105.png',
 						title: '暂停中'
 					},
 					'106': {
-						img: 'http://shopro.7wpp.com/imgs/live/106.png',
+						img: 'https://wx.yixiang.co/static/images/106.png',
 						title: '异常'
 					},
 					'107': {
-						img: 'http://shopro.7wpp.com/imgs/live/past.png',
+						img: 'https://wx.yixiang.co/static/images/past.png',
 						title: '已过期'
 					}
 				}
diff --git a/components/sh-adv.vue b/components/sh-adv.vue
index 4cb599e..1b8bc14 100644
--- a/components/sh-adv.vue
+++ b/components/sh-adv.vue
@@ -83,19 +83,19 @@
 			return {
 				detail: {
 					"list": [{
-						"image": "https:\/\/shopro-1253949872.file.myqcloud.com\/uploads\/20200704\/0669a6adec3f35d45ec66a082e03774f.png",
+						"image": "https:\/\/wx.yixiang.co\/static\/images\/index001.png",
 						"name": "",
 						"path": "/pages/user/coupon/GetCoupon/index",
 						"path_name": "优惠券",
 						"path_type": 1
 					}, {
-						"image": "https:\/\/shopro-1253949872.file.myqcloud.com\/uploads\/20200704\/cddb5d90a4241f6235d16368534bc730.png",
+						"image": "https:\/\/wx.yixiang.co\/static\/images\/index002.png",
 						"name": "",
 						"path": "/pages/shop/GoodsList/index",
 						"path_name": "商品",
 						"path_type": 1
 					}, {
-						"image": "https:\/\/shopro-1253949872.file.myqcloud.com\/uploads\/20200704\/e047d312fb5930de972ae288b9b3bae7.png",
+						"image": "https:\/\/wx.yixiang.co\/static\/images\/index003.png",
 						"name": "",
 						"path": "/pages/user/signIn/Integral/index",
 						"path_name": "积分",
diff --git a/pages/activity/DargainDetails/index.vue b/pages/activity/DargainDetails/index.vue
index 8f17eff..bfc81e7 100644
--- a/pages/activity/DargainDetails/index.vue
+++ b/pages/activity/DargainDetails/index.vue
@@ -206,7 +206,7 @@
         bargainSumCount: 0, //砍价成功人数
         activeMsg: "",
         // ssssss
-        active: true,
+        active: false,
         loading: false,
         datatime: 0,
         lookCount: 0, //查看人数
diff --git a/pages/activity/GoodsGroup/index.vue b/pages/activity/GoodsGroup/index.vue
index 4900543..bb629b1 100644
--- a/pages/activity/GoodsGroup/index.vue
+++ b/pages/activity/GoodsGroup/index.vue
@@ -35,15 +35,15 @@
           </view>
         </view>
         <!-- 空白 -->
-<!--        <shopro-empty v-if="!grouponList.length && !isLoading" :emptyData="emptyData"></shopro-empty>-->
+<!--        <Shop-empty v-if="!grouponList.length && !isLoading" :emptyData="emptyData"></Shop-empty>-->
         <!-- 加载更多 -->
         <view v-if="grouponList.length" class="cu-load text-gray" :class="loadStatus"></view>
         <!-- loading -->
-        <shopro-load v-model="isLoading"></shopro-load>
+        <Shop-load v-model="isLoading"></Shop-load>
       </scroll-view>
     </view>
     <!-- 自定义底部导航 -->
-    <shopro-tabbar></shopro-tabbar>
+    <Shop-tabbar></Shop-tabbar>
   </view>
 </template>
 
diff --git a/pages/home/components/Banner.vue b/pages/home/components/Banner.vue
index 1a3dfb3..8146a73 100644
--- a/pages/home/components/Banner.vue
+++ b/pages/home/components/Banner.vue
@@ -1,7 +1,7 @@
 <template>
     <view class="banner-swiper-box">
         <canvas canvas-id="colorThief" class="hide-canvas"></canvas>
-        <swiper class="banner-carousel shopro-selector-rect" circular @change="swiperChange" :autoplay="true">
+        <swiper class="banner-carousel Shop-selector-rect" circular @change="swiperChange" :autoplay="true">
             <swiper-item v-for="(item, index) in list" :key="index" class="carousel-item" @tap="routerTo(item.path)">
                 <image class="swiper-image " :src="item.pic" @click="goRoll(item)" mode="widthFix" lazy-load>
                 </image>
diff --git a/pages/home/components/Live.vue b/pages/home/components/Live.vue
index 1f71da4..2e8eec7 100644
--- a/pages/home/components/Live.vue
+++ b/pages/home/components/Live.vue
@@ -15,22 +15,15 @@
 					<text class="status-text">{{ liveStatus[live.liveStatus].title }}</text>
 				</view>
 				<view class="item-title">{{ live.name }}</view>
-				<image v-if="live.liveStatus == 101" class="like-img" src="http://shopro.7wpp.com/imgs/live/zan.gif"
+				<image v-if="live.liveStatus == 101" class="like-img" src="http://Shop.7wpp.com/imgs/live/zan.gif"
 					mode=""></image>
 			</view>
 		</view>
-		<!-- <view class="content-two">
-			<view class="content-two__item" v-for="live in detail" :key="live.id">
-				<ShoproLiveCard :detail="live" :wh="320">
-					<block slot="liveGoods"><text></text></block>
-				</ShoproLiveCard>
-			</view>
-		</view> -->
 	</view>
 </template>
 
 <script>
-	import ShoproLiveCard from '@/components/ShoproLiveCard.vue'
+	import ShopLiveCard from '@/components/ShopLiveCard.vue'
 
 	let HAS_LIVE = false
 	// #ifdef MP-WEIXIN
@@ -48,38 +41,38 @@
 	let timer = null;
 	export default {
 		components: {
-			ShoproLiveCard
+			ShopLiveCard
 		},
 		data() {
 			return {
 				liveList: [],
 				liveStatus: {
-					'101': {
-						img: 'http://shopro.7wpp.com/imgs/live/live.png',
+				'101': {
+						img: 'https://wx.yixiang.co/static/images/live.png',
 						title: '直播中'
 					},
 					'102': {
-						img: 'http://shopro.7wpp.com/imgs/live/prevue.png',
+						img: 'https://wx.yixiang.co/static/images/prevue.png',
 						title: '未开始'
 					},
 					'103': {
-						img: 'http://shopro.7wpp.com/imgs/live/playback.png',
+						img: 'https://wx.yixiang.co/static/images/playback.png',
 						title: '已结束'
 					},
 					'104': {
-						img: 'http://shopro.7wpp.com/imgs/live/104.png',
+						img: 'https://wx.yixiang.co/static/images/104.png',
 						title: '禁播'
 					},
 					'105': {
-						img: 'http://shopro.7wpp.com/imgs/live/105.png',
+						img: 'https://wx.yixiang.co/static/images/105.png',
 						title: '暂停中'
 					},
 					'106': {
-						img: 'http://shopro.7wpp.com/imgs/live/106.png',
+						img: 'https://wx.yixiang.co/static/images/106.png',
 						title: '异常'
 					},
 					'107': {
-						img: 'http://shopro.7wpp.com/imgs/live/past.png',
+						img: 'https://wx.yixiang.co/static/images/past.png',
 						title: '已过期'
 					}
 				}
diff --git a/pages/home/index.vue b/pages/home/index.vue
index cf96de0..6263303 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -5,7 +5,7 @@
 			<view class="cu-custom" :style="[{height:CustomBar+ 'px',}]">
 				<view class="cu-bar fixed" :style="customStyle" :class="[bgcolor]">
 					<view class="action">
-						<text class="nav-title shopro-selector-rect">{{ 'yshop商城' }}</text>
+						<text class="nav-title Shop-selector-rect">{{ 'yshop商城' }}</text>
 					</view>
 					<view class="content" :style="[{top:StatusBar + 'px'}]">
 
diff --git a/pages/shop/Live/LiveList/index.vue b/pages/shop/Live/LiveList/index.vue
index 9cb7eb8..389ac3f 100644
--- a/pages/shop/Live/LiveList/index.vue
+++ b/pages/shop/Live/LiveList/index.vue
@@ -12,7 +12,7 @@
       <scroll-view scroll-y="true" @scrolltolower="loadMore" class="scroll-box">
         <view class="list-box">
           <block v-for="live in liveList" :key="live.roomId">
-            <shopro-live-card :detail="live"></shopro-live-card>
+            <shop-live-card :detail="live"></shop-live-card>
           </block>
         </view>
         <view v-if="liveList.length" class="cu-load text-gray" :class="loadStatus"></view>
@@ -25,11 +25,11 @@
   import {
     yxWechatLive
   } from "@/api/live";
-  import ShoproLiveCard from '@/components/ShoproLiveCard.vue'
+  import ShopLiveCard from '@/components/ShopLiveCard.vue'
 
   export default {
     components: {
-      ShoproLiveCard
+      ShopLiveCard
     },
     data() {
       return {
diff --git a/pages/user/promotion/UserPromotion/index.vue b/pages/user/promotion/UserPromotion/index.vue
index 62831a8..fd7cb9a 100644
--- a/pages/user/promotion/UserPromotion/index.vue
+++ b/pages/user/promotion/UserPromotion/index.vue
@@ -20,7 +20,6 @@
         </view>
       </view>
     </view>
-    <view class="bnt bg-color-red" @click="toCash">立即提现</view>
     <view class="list acea-row row-between-wrapper">
       <view class="item acea-row row-center-wrapper row-column" @click="goPoster()">
         <text class="iconfont icon-erweima"></text>