From 8ae96f033924adc377568f171f5007f1bb136c06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=92=BB=E9=A3=8E?= <1090115880@qq.com>
Date: Wed, 31 Mar 2021 18:05:16 +0800
Subject: [PATCH] 3-31

---
 commit.csv                |  1 +
 main.js                   | 12 ++++++------
 pages/find/find.vue       | 29 +++++++++++++++--------------
 pages/index/index.vue     |  4 ++--
 pages/login/login.vue     |  2 +-
 pages/mine/mine.vue       | 10 ++++++++--
 pages/ranking/ranking.vue |  4 ++--
 utils/http.interceptor.js |  4 ++++
 8 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/commit.csv b/commit.csv
index 0c80a10..81ea2fd 100644
--- a/commit.csv
+++ b/commit.csv
@@ -1,3 +1,4 @@
+2021-03-30,17:45:05,3-30,189,161
 2021-03-29,20:26:56,3-29,932,416
 2021-03-26,17:52:00,3-26,545,353
 2021-03-25,17:52:15,3-25,326,1540
diff --git a/main.js b/main.js
index 3226d22..57d7832 100644
--- a/main.js
+++ b/main.js
@@ -21,13 +21,13 @@ Vue.component('goods-list', goodsList)
 Vue.component('order-goods', orderGoods)
 Vue.component('large-image-list', largeImageList)
 // 测试域名
-Vue.prototype.BASE_URL = "https://testapi.reecook.cn"
-Vue.prototype.IMAGE_URL = "https://testcdn.reecook.cn/static"
-Vue.prototype.H5_BASE_URL = "https://testh5.reecook.cn"
-// // 正式域名
-// Vue.prototype.BASE_URL = "https://api.reecook.cn"
-// Vue.prototype.IMAGE_URL = "https://cdn.reecook.cn/static"
+// Vue.prototype.BASE_URL = "https://testapi.reecook.cn"
+// Vue.prototype.IMAGE_URL = "https://testcdn.reecook.cn/static"
 // Vue.prototype.H5_BASE_URL = "https://testh5.reecook.cn"
+// // 正式域名
+Vue.prototype.BASE_URL = "https://api.reecook.cn"
+Vue.prototype.IMAGE_URL = "https://cdn.reecook.cn/static"
+Vue.prototype.H5_BASE_URL = "https://testh5.reecook.cn"
 
 //腾讯地图key
 Vue.prototype.MAP_KEY = "SPVBZ-2EXWJ-WTEFC-K7ANJ-VG7G6-V7FQ6"
diff --git a/pages/find/find.vue b/pages/find/find.vue
index 653df02..b6bf0ab 100644
--- a/pages/find/find.vue
+++ b/pages/find/find.vue
@@ -13,13 +13,13 @@
 
 			<swiper class="flex-sub" :current="currentIndex" :duration="300" :indicator-dots="false" :autoplay="false" @change="changeCurrent">
 				<!-- 直播回放列表 -->
-				<swiper-item>
+			<!-- 	<swiper-item>
 					<live-videos></live-videos>
-				</swiper-item>
+				</swiper-item> -->
 				<!-- 小视频列表 -->
-				<swiper-item>
+		<!-- 		<swiper-item>
 					<small-videos></small-videos>
-				</swiper-item>
+				</swiper-item> -->
 				<!-- 图文动态列表 -->
 				<swiper-item>
 					<dynamics :showGoodsLink="true"></dynamics>
@@ -30,20 +30,21 @@
 </template>
 
 <script>
-	import liveVideos from 'components/liveVideos.vue'
-	import smallVideos from 'components/smallVideos.vue'
+	// import liveVideos from 'components/liveVideos.vue'
+	// import smallVideos from 'components/smallVideos.vue'
 	import dynamics from 'components/dynamics.vue'
 	export default {
 		data() {
 			return {
 				showMybtn: false,
 				currentIndex: 0,
-				list: [{
-						name: '直播'
-					},
-					{
-						name: '视频'
-					},
+				list: [
+					// {
+					// 	name: '直播'
+					// },
+					// {
+					// 	name: '视频'
+					// },
 					{
 						name: '图文'
 					}
@@ -51,8 +52,8 @@
 			};
 		},
 		components: {
-			liveVideos,
-			smallVideos,
+			// liveVideos,
+			// smallVideos,
 			dynamics
 		},
 		onLoad() {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2da1d9b..ed93c90 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -136,12 +136,12 @@
 						<view class="txt">复制链接</view>
 					</button>
 				</view>
-				<view class="flex-sub flex justify-center">
+		<!-- 		<view class="flex-sub flex justify-center">
 					<button class="flex flex-direction justify-center align-center" @tap="postShare">
 						<image class="share-icon" src="/static/mine/post.png" mode="widthFix"></image>
 						<view class="txt">二维码海报</view>
 					</button>
-				</view>
+				</view> -->
 			</view>
 			<view class="cancle" @tap="hideModel">取消</view>
 		</u-popup>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 22734f8..3d19a63 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view v-if="type !== 'share'" style="position: absolute; top: 25px; right: 16px;" @tap="toMobileLogin">手机号登录</view>
+		<!-- <view v-if="type !== 'share'" style="position: absolute; top: 25px; right: 16px;" @tap="toMobileLogin">手机号登录</view> -->
 		<view class="logo-box flex flex-direction align-center">
 			<image :src="IMAGE_URL+'/logo.png'" mode="widthFix"></image>
 			<view class="">享受指尖的购物乐趣</view>
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index 5287602..ad26985 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -610,8 +610,14 @@
 					let r = this.convert_length(80)
 					if (result.cardType) {
 						this.Progressbar(100, 100, r, this.progressColor.start, this.progressColor.end);
-					} else {
-						this.Progressbar(result.amount, result.needAmount, r, this.progressColor.start, this.progressColor.end);
+					} else {
+						let amount = result.amount
+						let needAmount = result.needAmount
+						if(needAmount === 0){
+							amount = 0
+							needAmount = 100
+						}
+						this.Progressbar(amount, needAmount, r, this.progressColor.start, this.progressColor.end);
 					}
 				});
 			},
diff --git a/pages/ranking/ranking.vue b/pages/ranking/ranking.vue
index 08abed8..74aa2af 100644
--- a/pages/ranking/ranking.vue
+++ b/pages/ranking/ranking.vue
@@ -27,12 +27,12 @@
 						<view class="txt">复制链接</view>
 					</button>
 				</view>
-				<view class="flex-sub flex justify-center">
+			<!-- 	<view class="flex-sub flex justify-center">
 					<button class="flex flex-direction justify-center align-center" @tap="postShare">
 						<image class="share-icon" src="/static/mine/post.png" mode="widthFix"></image>
 						<view class="txt">二维码海报</view>
 					</button>
-				</view>
+				</view> -->
 			</view>
 			<view class="cancle" @tap="hideModel">取消</view>
 		</u-popup>
diff --git a/utils/http.interceptor.js b/utils/http.interceptor.js
index 5c28b75..dab0078 100644
--- a/utils/http.interceptor.js
+++ b/utils/http.interceptor.js
@@ -50,6 +50,10 @@ const install = (Vue, vm) => {
 		config.header["X-Recook-ID"] = id
 		config.header["X-Recook-Token"] = token
 		config.header["Device-Type"] = "wxapp"
+		config.header["X-Recook-System"] = 'wxapp'
+		// 当前版本 281 32
+		config.header["X-Recook-version"] = "32"
+		
 		// console.log("请求参数为========",config.data)
 		config.data = Encrypt(config.data)
 	}