Signed-off-by: 李妹妹 <1639016684@qq.com>

App.vue

@@ -3,11 +3,6 @@
 	// import TIM from 'tim-wx-sdk';
 	// import COS from 'cos-wx-sdk-v5';
 	export default {
-		globalData: {
-			// wsUrl: 'wss://websocket.cdwjyyh.com',
-			wsUrl: '',
-			appId: 'wx30d1ed5dbbdc5cc5',
-		},
 		onLoad: function (){
 			
 		},

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "百域臻品",
+    "name" : "百域佳选",
     "appid" : "__UNI__A8490FA",
     "description" : "",
     "versionName" : "1.0.0",
@@ -52,7 +52,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx30d1ed5dbbdc5cc5",
+        "appid" : "wxcc2de555e32acb08",
         "setting" : {
             "urlCheck" : false
         },

pages.json

@@ -31,7 +31,8 @@
 		{
 			"path": "pages/home/index",
 			"style": {
-				"navigationBarTitleText": "百域臻品",
+				//"navigationBarTitleText": "百域佳选",
+				"navigationBarTitleText": "百域佳选",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom",
 				"app-plus": {
@@ -1549,7 +1550,7 @@
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "百域臻品",
+		"navigationBarTitleText": "百域佳选",
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#FFFFFF"
 	},

pages/auth/login.vue

@@ -8,7 +8,7 @@
 		  		<!-- <image  :src="imgPath+'/app/images/logo.png'"></image> -->
 				<image  src="/static/logo.png"></image>
 		  	</view>
-		  	<view class="title">百域臻品</view>
+		  	<view class="title">百域佳选</view>
 		  </view>
         <!-- <open-data class="user-avatar" type="userAvatarUrl"></open-data>
         <open-data class="user-name" type="userNickName"></open-data> -->

pages/common/launch.vue

@@ -5,7 +5,7 @@
 				<view class="circle"></view>
 				<image src="/static/logo.png"></image>
 			</view>
-			<text class="text">百域臻品</text>
+			<text class="text">百域佳选</text>
 		</view>
 	</view>
 </template>

pages/home/index.vue

@@ -9,7 +9,8 @@
 					<!-- 这里是状态栏 -->
 					<view class="status_bar" :style="{height: statusBarHeight}"></view>
 					<view class="top-title">
-						<view class="name" >百域臻品</view>
+						<!-- <view class="name" >百域佳选</view> -->
+						<view class="name" >百域佳选</view>
 						<!-- <view class="dot">•</view><view class="sub-name">七彩互联网医院</view> -->
 					</view>
 					<!-- 搜索框、购物车、客服 -->
@@ -464,7 +465,7 @@
 		},
 		onShareAppMessage(res) {
 			return {
-				title: '百域臻品-您的专属解决方案',
+				title: '百域佳选-您的专属解决方案',
 				path: `/pages/common/launch`,
 				// imageUrl: this.$store.state.imgpath +'/app/image/logo.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 			imageUrl: '/static/logo.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
@@ -477,7 +478,7 @@
 		//分享到朋友圈
 		onShareTimeline(res) {
 			return {
-				title: '百域臻品-您的专属解决方案',
+				title: '百域佳选-您的专属解决方案',
 				query: '', //页面参数
 				imageUrl: '/static/logo.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				// imageUrl: this.$store.state.imgpath +'/app/image/logo.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4

pages/shopping/productDetails.vue

@@ -365,7 +365,7 @@ import {CustomToast} from '@/components/custom-toast.vue';
 					// 如果限购数量为0，提示库存不足
 					if (this.remainingPurchaseLimit === 0) {
             this.$refs.customToast.show({
-              title: `该商品限购：${this.this.purchaseLimit}件\n已达购买上限`,
+              title: `该商品限购：${this.purchaseLimit}件\n已达购买上限`,
               duration: 2000
             });
 						// uni.showToast({
@@ -597,7 +597,7 @@ import {CustomToast} from '@/components/custom-toast.vue';
 				if (this.remainingPurchaseLimit !== null && typeof this.remainingPurchaseLimit === 'number' && this.specNum > this.remainingPurchaseLimit) {
 					this.specNum = this.remainingPurchaseLimit;
           this.$refs.customToast.show({
-            title: `该商品限购：${this.this.remainingPurchaseLimit}件\n已达购买上限`,
+            title: `该商品限购：${this.remainingPurchaseLimit}件\n已达购买上限`,
             duration: 2000
           });
 					// uni.showToast({
@@ -619,7 +619,7 @@ import {CustomToast} from '@/components/custom-toast.vue';
 				if (this.remainingPurchaseLimit !== null && typeof this.remainingPurchaseLimit === 'number' && this.specNum > this.remainingPurchaseLimit) {
 					this.specNum = this.remainingPurchaseLimit;
           this.$refs.customToast.show({
-            title: `该商品限购：${this.this.remainingPurchaseLimit}件\n已达购买上限`,
+            title: `该商品限购：${this.remainingPurchaseLimit}件\n已达购买上限`,
             duration: 2000
           });
 					// uni.showToast({
@@ -637,10 +637,10 @@ import {CustomToast} from '@/components/custom-toast.vue';
 				// 检查限购数量
 				if (this.remainingPurchaseLimit !== null && typeof this.remainingPurchaseLimit === 'number' && this.specNum > this.remainingPurchaseLimit) {
 					this.specNum = this.remainingPurchaseLimit;
-          this.$refs.customToast.show({
-            title: `该商品限购：${this.this.remainingPurchaseLimit}件\n已达购买上限`,
-            duration: 2000
-          });
+                 this.$refs.customToast.show({
+                 title: `该商品限购：${this.remainingPurchaseLimit}件\n已达购买上限`,
+                  duration: 2000
+                  });
 					// uni.showToast({
 					// 	icon: 'none',
 					// 	title: "该商品限购：" + this.remainingPurchaseLimit + "次，已达购买上限",

pages/user/index.vue

@@ -187,12 +187,12 @@
 							</view> -->
 
 							<!-- 测试用下面的 -->
-							<!-- <view v-if="Version" class="item no-marin-bottom align-top" @click="navgetTo('/pages_course/livingList')">
+							<view v-if="Version" class="item no-marin-bottom align-top" @click="navgetTo('/pages_course/livingList')">
 								<image
 									src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/integral.png"
 									mode=""></image>
 								<text class="text">直播</text>
-							</view> -->
+							</view>
 
 							<view class="item no-marin-bottom" @click="toManager()">
 								<image

pages_company/order/confirmCompanyOrder.vue

@@ -86,7 +86,7 @@
 		//发送给朋友
 		onShareAppMessage(res) {
 			return {
-				title: "百域臻品-您的专属解决方案",
+				title: "百域佳选-您的专属解决方案",
 				path: '/pages_company/order/confirmOrder?orderKey='+this.orderKey,
 				imageUrl: '/static/logo.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 			}
@@ -95,7 +95,7 @@
 		//分享到朋友圈
 		onShareTimeline(res) {
 			return {
-				title:"百域臻品-您的专属解决方案",
+				title:"百域佳选-您的专属解决方案",
 				query:'orderKey='+this.orderKey,
 				imageUrl:  '/static/logo.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 			}

pages_course/becomeVIP.vue

@@ -81,7 +81,7 @@
 			</view>
 		</u-popup>
 		<!--#endif-->
-		<view class="footer-tips">重庆百域臻品提供技术支持</view>
+		<view class="footer-tips">重庆百域佳选提供技术支持</view>
 	</view>
 </template>
 

pages_course/living.vue

@@ -14,7 +14,7 @@
 						@waiting="onVideoWaiting" preload="auto" type="application/x-mpegURL" :controls="false"></video>
 				</view>
 				<image v-if="liveItem.status == 1 && !liveItem.previewUrl" class="trailer-placeholder"
-					src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/userapp/images/readyStartOne.png">
+					src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/userapp/images/readyStart.png">
 				</image>
 				<view class="countdown-container" v-if="liveItem.status == 1 && liveCountdown">
 					<view class="live-name" v-if="liveItem.previewUrl">{{ liveItem.liveName }}</view>
@@ -888,8 +888,8 @@ import {CustomToast} from '@/components/custom-toast.vue';
 				networkType: 'unknown', // 当前网络类型
 				isNetworkAvailable: true, // 网络是否可用
 
-				// templateId: 'PP138PbExil47x7RIIzy_XheiEsyWv6-R3_aHm5Qs7Q', //百域承品
-				templateId: 'ELHbRqBdzSV7ttXTWw7RgnddnIqkj2-ld8dMU-gJmyU', //乐享优品
+				templateId: 'w9YHpfZb5QpMI4hGc-IrXGZGlftw7MuYvGwH2S2R260', //百域佳选
+				//templateId: 'ELHbRqBdzSV7ttXTWw7RgnddnIqkj2-ld8dMU-gJmyU', //乐享优品
 				isAgreement: false,
 
 				wsNewUrl: 'wss://api.fhhx.runtzh.com/ws/app/webSocket',
@@ -2289,7 +2289,9 @@ import {CustomToast} from '@/components/custom-toast.vue';
 				}
 				this.editUser();
 				uni.setStorageSync('userInfo', this.userInfo);
-				this.userlogo = false;
+				if(this.user.nickname){
+					this.userlogo = false;
+				}
 			},
 
 			editUser() {
@@ -5957,13 +5959,13 @@ import {CustomToast} from '@/components/custom-toast.vue';
 
 						.countdown-label {
 							font-size: 32rpx;
-							//color: rgba(250, 214, 176, 1);
-							color:#fff
+							color: rgba(250, 214, 176, 1);
+							//color:#fff
 						}
 
 						.countdown-separator {
 							font-size: 24rpx;
-							color: #999999;
+							color: rgba(250, 214, 176, 1);
 						}
 
 						.countdown-unit {
@@ -5976,8 +5978,8 @@ import {CustomToast} from '@/components/custom-toast.vue';
 							margin: 0 8rpx;
 							font-weight: 500;
 							font-size: 36rpx;
-							color: #a30c0b;
-							//color: rgba(0, 75, 59, 1);
+							//color: #a30c0b;
+							color: rgba(0, 75, 59, 1);
 							line-height: 60rpx;
 						}
 					}
@@ -6002,17 +6004,17 @@ import {CustomToast} from '@/components/custom-toast.vue';
 						font-weight: bold;
 
 						&.reserve-button {
-							//color: rgba(0, 110, 80, 1);
-							color: #a30c0b;
+							color: rgba(0, 110, 80, 1);
+							//color: #a30c0b;
 							background: linear-gradient(231.51deg, rgba(249, 215, 178, 1) 0%, rgba(255, 255, 191, 1) 47.83%, rgba(255, 250, 229, 1) 65.77%, rgba(248, 214, 178, 1) 100%);
 
 						}
 
 						&:not(.reserve-button) {
-							//color: rgba(255, 246, 214, 1);
-							//background: rgba(0, 110, 80, 1);
-							color: #fff;
-						    background: #a30c0b;
+							color: rgba(255, 246, 214, 1);
+							background: rgba(0, 110, 80, 1);
+							// color: #fff;
+						 //    background: #a30c0b;
 						}
 
 						.button-icon {

pages_course/reward.vue

@@ -6,7 +6,7 @@
 		<view class="answerPopup-title">恭喜你，回答正确</view>
 		<view class="answerPopup-desc">您有一份奖励待领取哦</view>
 		<view class="answerPopup-btn" @click="handleReceive">领取</view>
-		<view class="footer-tips">重庆百域臻品提供技术支持</view>
+		<view class="footer-tips">重庆百域佳选提供技术支持</view>
 	</view>
 </template>
 

pages_course/videovip.vue

@@ -247,7 +247,7 @@
 				<view class="submitname" @click="confimrname" :class="nameuser&&avataruser?'subact':'sub'">确定</view>
 			</view>
 		</u-popup>
-		<view class="footer-tips">重庆百域臻品提供技术支持</view>
+		<view class="footer-tips">重庆百域佳选提供技术支持</view>
 		<!-- footer -->
 		<view class="footer" v-if="videoId">
 			<view class="btns"  >

pages_manage/login.vue

@@ -29,7 +29,7 @@
 				</view>
 			 </view>
 		 </view>
-		 <view class="footer-tips">重庆百域臻品提供技术支持</view>
+		 <view class="footer-tips">重庆百域佳选提供技术支持</view>
 	</view>
 </template>
 

pages_shopping/live/complaint.vue

@@ -4,7 +4,7 @@
 			<view class="color#{$5} ">投诉对象</view>
 			<view class="align-center mt30 mb50">
 				<image class="w98 h98 mr30" style="border-radius: 50%;" src="/static/logo.png"></image>
-				<text>百域臻品</text>
+				<text>百域佳选</text>
 			</view>
 		</view>
 		<view class="container" >

pages_shopping/live/refundOrder.vue

@@ -140,10 +140,11 @@
 					if (res.code == 200) {
 						this.order = res.order;
 						this.items = res.items;
-						if (this.order.isPayRemain == 0) {
-							this.refundAmount = this.order.totalPrice.toFixed(2)
-						} else {
-							this.refundAmount = this.order.totalPrice.toFixed(2)
+						if(this.order.isPayRemain==0){
+							this.refundAmount=this.order.payMoney.toFixed(2)
+						}
+						else{
+							this.refundAmount=this.order.payPrice.toFixed(2)
 						}
 					} else {
 						uni.showToast({
@@ -200,7 +201,7 @@
 						});
 						setTimeout(function() {
 							uni.redirectTo({
-								url: './order'
+								url: '/pages_user/user/storeOrder?status='
 							})
 						}, 500);
 

pages_shopping/live/success.vue

@@ -101,7 +101,7 @@
 
 				} else {
 					uni.navigateTo({
-						url: './order'
+						url: '/pages_user/user/storeOrder?status='
 					})
 				}
 			}

pages_user/user/pay.vue

@@ -4,7 +4,7 @@
 			<view class="inner">
 				<view class="pay">
 					<view class="title">
-						<text class="name">付款给 百域臻品</text>
+						<text class="name">付款给 百域佳选</text>
 						<text class="desc">微信收款</text>
 					</view>
 					<view class="pay-money">
@@ -58,7 +58,7 @@
 		},
 		onShareAppMessage(res) {
 			return {
-				title: '百域臻品-收款',
+				title: '百域佳选-收款',
 				path: `/pages_user/user/pay?companyId=`+this.companyId+"&companyUserId="+this.companyUserId
 			}
 		},

pages_user/user/storeOrderDetail.vue

@@ -197,7 +197,7 @@
 						</view>
 						<view   class="item">
 							<text class="label">支付金额</text>
-							<text class="text" v-if="order.payMoney!=null">¥{{order.payMoney.toFixed(2)}}</text>
+							<text class="text" v-if="order.payPrice!=null">¥{{order.payPrice.toFixed(2)}}</text>
 						</view>
 						<view class="item">
 							<text class="label">运费</text>

pages_user/user/userTuiAdd.vue

@@ -1,12 +1,12 @@
 <template>
   <view>
 		<view class="form-box">
-			<view class="title">你为什么想成为百域臻品健康推广?</view>
+			<view class="title">你为什么想成为百域佳选健康推广?</view>
 			<view class="textarea-box">
 				<textarea v-model="question1" value="" placeholder="请输入..." maxlength="200" placeholder-class="textarea-place" />
 				<view class="num-box">{{ question1.length }}/200</view>
 			</view>
-			<view class="title">你是否了解百域臻品健康推广大使?</view>
+			<view class="title">你是否了解百域佳选健康推广大使?</view>
 			<view class="textarea-box">
 				<textarea v-model="question2" value="" placeholder="请输入..." maxlength="200" placeholder-class="textarea-place" />
 				<view class="num-box">{{ question1.length }}/200</view>

store/index.js

@@ -18,8 +18,10 @@ export default new Vuex.Store({
 	// imgpath: 'https://jnlzjk-1323137866.cos.ap-chongqing.myqcloud.com',//百域承品图片请求地址
 	imgpath: 'https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com',//百域承品图片请求地址
 	// https://jnlzjk-1323137866.cos.ap-chongqing.myqcloud.com/shop  百域承品图片链接
-	logoname:'百域臻品',
-	appid:'wx30d1ed5dbbdc5cc5',//百域承品
+	logoname:'百域佳选',
+	appid:'wxcc2de555e32acb08',//百域佳选	// logonam百域佳选域臻品',
+	// appid:'wxcc2de555e32acb08'百域佳选域臻品
+	
   },
   getters: {
     coureLogin: (state) => state.coureLogin,