客服修改为链接企业客服，调整整体色调

App.vue

@@ -4,12 +4,11 @@
 	export default {
 		globalData:{
 			outside:true,//是否外界进来,默认是
-			hostApi:'https://dxscrm.scdxtc.com/',//域名
+			hostApi:'https://dxscrm.scdxtc.com/api/',//域名
 			latitude:30.656693,//纬度
 			longitude:104.136425//经度
 		},
 		onLaunch: function() {
-			console.log(this.globalData.hostApi,12);
 			// 获取主题色事件
 			themeEv();
 			this.autoUpdate();
@@ -18,7 +17,6 @@
 			toolAll.tools.isVedio();
 		}, 
 		onShow: function() { 
-			console.log(this.globalData.hostApi,12);
 			if(uni.getStorageSync('token')) {
 				toolAll.tools.networkStatus();//检查当前网络状态
 				toolAll.tools.refreshToken();//每十分钟刷新token

commons/hengmei.css

@@ -70,7 +70,7 @@
 /* 病种列表 */
 .problem-input{border: 2rpx solid #E0E0E0;padding: 0rpx 20rpx;height: 80rpx;line-height: 80rpx;}
 /* 暂无内容时，显示的图片大小 */
-.zanw-img{width: 474rpx;height: 273rpx;}
+.zanw-img{width: 180rpx;}
 /* 修改资料页面 */
 .head_img{width: 140rpx;height: 140rpx;border-radius: 100%;}
 .nic{color: #101010;}

commons/icon-font.css

@@ -0,0 +1,143 @@
+@font-face {
+  font-family: "iconfont"; /* Project id 3180711 */
+  src: url('https://at.alicdn.com/t/font_3180711_14xpivprz1c.woff2?t=1650872732612') format('woff2'),
+       url('https://at.alicdn.com/t/font_3180711_14xpivprz1c.woff?t=1650872732612') format('woff'),
+       url('https://at.alicdn.com/t/font_3180711_14xpivprz1c.ttf?t=1650872732612') format('truetype');
+}
+
+.icon {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-add-picture05:before {
+  content: "\e639";
+}
+
+.icon-add-picture04:before {
+  content: "\e636";
+}
+
+.icon-add-picture03:before {
+  content: "\e642";
+}
+
+.icon-add-picture02:before {
+  content: "\e8bc";
+}
+
+.icon-add-picture01:before {
+  content: "\e62c";
+}
+
+.icon-sandian:before {
+  content: "\e769";
+}
+
+.icon-nothing-collection:before {
+  content: "\e610";
+}
+
+.icon-nothing-more:before {
+  content: "\e624";
+}
+
+.icon-nothing-data:before {
+  content: "\e60c";
+}
+
+.icon-address-check:before {
+  content: "\e6c2";
+}
+
+.icon-address-unchecked:before {
+  content: "\e623";
+}
+
+.icon-navigate-now:before {
+  content: "\e640";
+}
+
+.icon-send-goods:before {
+  content: "\e601";
+}
+
+.icon-payment:before {
+  content: "\e602";
+}
+
+.icon-finish:before {
+  content: "\e63f";
+}
+
+.icon-take:before {
+  content: "\e649";
+}
+
+.icon-refund:before {
+  content: "\e613";
+}
+
+.icon-customer-black:before {
+  content: "\ec2e";
+}
+
+.icon-customer:before {
+  content: "\e628";
+}
+
+.icon-check:before {
+  content: "\e61e";
+}
+
+.icon-del-white:before {
+  content: "\e61f";
+}
+
+.icon-screen:before {
+  content: "\e60b";
+}
+
+.icon-search:before {
+  content: "\e653";
+}
+
+.icon-caidan-mo:before {
+  content: "\e73e";
+}
+
+.icon-renwu-mo:before {
+  content: "\e73f";
+}
+
+.icon-shop-cart:before {
+  content: "\e73d";
+}
+
+.icon-caidan-active:before {
+  content: "\e608";
+}
+
+.icon-renwu-acitve:before {
+  content: "\e67c";
+}
+
+.icon-home-mo:before {
+  content: "\e673";
+}
+
+.icon-home-active:before {
+  content: "\e674";
+}
+
+.icon-return:before {
+  content: "\e600";
+}
+
+.icon-next:before {
+  content: "\e60e";
+}
+

components/bottom-tab.vue

@@ -7,7 +7,7 @@
 			<view @tap="lianK" class="disac posir lianShare" style="background-color: #3875F6; border-top-left-radius: 51rpx;border-bottom-left-radius: 51rpx;">
 				<image src="/static/public/bottom-customer.png" class="mar-zy20" style="width: 47rpx;height: 47rpx;" mode="aspectFill"></image>
 				<view>联系客服</view>
-				<button class="fon24 posia" style="opacity: 0;top: 0;left: 0;right: 0;bottom: 0;" open-type="contact">客服</button>
+				<!-- <button class="fon24 posia" style="opacity: 0;top: 0;left: 0;right: 0;bottom: 0;" open-type="contact">客服</button> -->
 			</view>
 			<view class="disac posir lianShare" style="background-color: #38CE51;border-top-right-radius: 51rpx;border-bottom-right-radius: 51rpx;">
 				<image src="/static/public/bottom-shear.png" style="width: 47rpx;height: 47rpx;margin-left: 15rpx;margin-right: 8rpx;" mode="aspectFill">
@@ -34,6 +34,11 @@
 				})
 			},
 			lianK() { //客服
+				wx.openCustomerServiceChat({
+					extInfo: {url: `https://work.weixin.qq.com/kfid/kfc0d895c27861955a2?enc_scene=${'ENC6yeVMve4yhC238GG9zc5VYa6WaddYNHvNriZ6KueYvXj'}&scene_param=${uni.getStorageSync('openid')}`},
+					corpId: 'ww62997b64e2c56170',
+					success(res) {}
+				})
 				this.$requst.post('user/rand-bind-service').then(res => {})
 				this.$toolAll.tools.closeTimer() //清空埋点倒计时
 				this.$requst.post('user/record', {

components/foot-tab.vue

@@ -17,7 +17,7 @@
 					<view class="posir" :class="index==2 ? 'centerBox-item':''">
 						<image :class="index==2 ? 'centerImg':'moImg'" v-if="newcurrent==index" :src="itemi.selectedIconPath"></image>
 						<image :class="index==2 ? 'centerImg':'moImg'" v-else :src="itemi.iconPath"></image>
-						<button v-if="index==2 && isKef" class="fon24 posia" style="opacity: 0;top: 0;left: 0;right: 0;bottom: 0;" open-type="contact">客服</button>
+						<!-- <button v-if="index==2 && isKef" class="fon24 posia" style="opacity: 0;top: 0;left: 0;right: 0;bottom: 0;" open-type="contact">客服</button> -->
 					</view>
 				</view>
 			</view>
@@ -102,11 +102,11 @@
 						break;
 					case 2:
 					if(existMobile!=''){
-						// wx.openCustomerServiceChat({
+						wx.openCustomerServiceChat({
-						// 	extInfo: {url: `https://work.weixin.qq.com/kfid/kfcb3bba5b57d9a42ba?enc_scene=ENC616HXDjLYNcmsR49PBE75UERg8Ncv3dygpYjfnh3XVvA&scene_param=${uni.getStorageSync('openid')}`},
+							extInfo: {url: `https://work.weixin.qq.com/kfid/kfc0d895c27861955a2?enc_scene=${'ENC6yeVMve4yhC238GG9zc5VYa6WaddYNHvNriZ6KueYvXj'}&scene_param=${uni.getStorageSync('openid')}`},
-						// 	corpId: 'ww1f86f258d4ff5817',
+							corpId: 'ww62997b64e2c56170',
-						// 	success(res) {}
+							success(res) {}
-						// })
+						})
 						this.$requst.post('user/rand-bind-service').then(res=>{})
 						this.$toolAll.tools.closeTimer()//清空埋点倒计时
 						this.$requst.post('user/record',{type:'other',action:'ask',id:0}).then(res=>{},error=>{})
@@ -124,7 +124,7 @@
             },
 			// 前往登录页
 			goLogin(){
-				uni.reLaunch({
+				uni.reLaunchENCGp1Z2XmC3n4g2NibCrXxyrUbHutgkeVhkAhYr6Qi6Xt2({
 					url:'/pages/login/login'
 				})
 			},
@@ -159,7 +159,7 @@
 	.item-box>view{width: 25%;text-align: center;}
 	.centerBox{display: flex;justify-content: center;align-items: center;}
 	/* .centerBox-item{width: 124rpx;height: 124rpx;background-color: rgba(244, 244, 244, 1);margin-top: -100rpx;border-radius: 100%;display: flex;justify-content: center;align-items: center;} */
-	.centerBox-item{width: 124rpx;height: 124rpx;margin-top: -100rpx;border-radius: 100%;display: flex;justify-content: center;align-items: center;}
+	.centerBox-item{width: 124rpx;height: 124rpx;margin-top: -100rpx;border-radius: 100%;display: flex;justify-content: center;align-items: center;background-color: transparent;}
 	.centerImg{width: 112rpx;height: 112rpx;}
 	
 	/* 公共 */

components/list-pu.vue

@@ -86,8 +86,8 @@
 				</view>
 			</view>
 		</view>
-		<view v-else class="" style="display: flex;flex-direction: column;align-items: center;">
+		<view v-else style="display: flex;flex-direction: column;align-items: center;">
-			<image src="/static/public/nothing.png" style="width: 474rpx;height: 273rpx;" mode="aspectFill"></image>
+			<image src="/static/public/nothing.png" style="width: 180rpx;" mode="widthFix"></image>
 			<!-- <view class="fon24 col3" style="margin-bottom: 60rpx;">暂无内容</view> -->
 		</view>
 		<!-- 弹框 -->

components/nothing-page.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="nothing">
 		<view class="nothing-box">
-			<image lazy-load :src="imgSrc" mode="aspectFill"></image>
+			<image lazy-load :src="imgSrc" mode="widthFix"></image>
 			<view class="nothing-con">{{content}}</view>
 		</view>
 	</view>
@@ -31,6 +31,6 @@
 <style scoped>
 .nothing{position: fixed;top: 0;right: 0;left: 0;bottom: 0;display: flex;justify-content: center;align-items: center;}
 .nothing-box{display: flex;justify-content: center;flex-direction: column;align-items: center;}
-.nothing-box>image{width: 474rpx;height: 273rpx;}
+.nothing-box>image{width: 260rpx;}
 .nothing-con{font-size: 24rpx;font-family: PingFang SC;font-weight: 500;line-height: 33rpx;color: #333333;text-align: center;}
 </style>

components/public-customer.vue

@@ -3,7 +3,7 @@
 		<view @tap="lianK" :style="{background:publicColor,right:nright+'rpx',bottom:nbottom+'rpx'}" :class="isSmall?'smallImg':''" class="fw posir customer-box" style="position: fixed;z-index: 2; width: 120rpx;height: 120rpx;border-radius: 100%;display: flex;justify-content: center;align-items: center;box-shadow: 0rpx 0rpx 20rpx rgba(0,0,0,.22);">
 			<image class="posia" src="/static/public/btnKF.png" style="width: 50rpx;height: 50rpx;top: 20rpx;" mode="" lazy-load></image>
 			<view class="colf fon20 posia" style="bottom: 20rpx;">在线客服</view>
-			<button class="fon24 posia" style="opacity: 0;top: 0;left: 0;right: 0;bottom: 0;" open-type="contact">客服</button>
+			<!-- <button class="fon24 posia" style="opacity: 0;top: 0;left: 0;right: 0;bottom: 0;" open-type="contact">客服</button> -->
 		</view>
 	</view>
 </template>
@@ -40,6 +40,11 @@
 		},
 		methods:{
 			lianK(){
+				wx.openCustomerServiceChat({
+					extInfo: {url: `https://work.weixin.qq.com/kfid/kfc0d895c27861955a2?enc_scene=${'ENC6yeVMve4yhC238GG9zc5VYa6WaddYNHvNriZ6KueYvXj'}&scene_param=${uni.getStorageSync('openid')}`},
+					corpId: 'ww62997b64e2c56170',
+					success(res) {}
+				})
 				this.$requst.post('user/rand-bind-service').then(res=>{})
 				this.$toolAll.tools.closeTimer()//清空埋点倒计时
 				this.$requst.post('user/record',{type:'other',action:'ask',id:this.nid}).then(res=>{},error=>{})

jsFile/publicAPI.js

@@ -84,8 +84,8 @@ export function themeEv(){//查询主题色
 					res.data.footBar.forEach(item=>{
 						let newName = item.name
 						let newObj = {
-							iconPath:'https://oss.hmzfyy.cn' + item.icon[0],
+							iconPath:'https://dxscrm.scdxtc.com' + item.icon[0],
-							selectedIconPath:'https://oss.hmzfyy.cn' + item.icon[1],
+							selectedIconPath:'https://dxscrm.scdxtc.com' + item.icon[1],
 						}
 						if(item.key=="home"){
 							imgList[0] = newObj
@@ -133,7 +133,7 @@ export function checkQuan(){//查询优惠券
 		if(res.code==0){
 			if(res.data.has_coupon==1){
 				uni.setStorageSync('isQuan',true);
-				uni.setStorageSync('quanImg','https://oss.hmzfyy.cn' + res.data.home_coupon.cover);
+				uni.setStorageSync('quanImg','https://dxscrm.scdxtc.com' + res.data.home_coupon.cover);
 				uni.setStorageSync('quanId',res.data.home_coupon.id);
 			} else {
 				uni.setStorageSync('isQuan',false);

jsFile/requst.js

@@ -1,5 +1,5 @@
 const ENV = process.env; 
-let hostapi = 'https://dxscrm.scdxtc.com/';
+let hostapi = 'https://dxscrm.scdxtc.com/api/';
 // 请求错误处理
 const checkError = (e) => {
     // console.error("----接口错误----", e)

jsFile/tools.js

@@ -4,6 +4,7 @@ const tools = {
 	timer:'',
 	// 埋点倒计时
 	daoTime(){
+		clearInterval(this.timer);
 		let daoTime = uni.getStorageSync('daoTime')
 		if(daoTime==''){//初次判断倒计时是否为空
 			uni.setStorageSync('daoTime',60)//设置倒计时
@@ -216,7 +217,7 @@ const tools = {
 		})
 		.replace('<section', '<div')
 		.replace(/\<img/g, '<img @tap="pre" style="max-width:100%!important;height:auto;" ')
-		.replace(/src=\"/g,'src="https://oss.hmzfyy.cn');
+		.replace(/src=\"/g,'src="https://dxscrm.scdxtc.com');
 		// 去除图片间隙 vertical-align:middle;
 	},
 	updaX(){//检测小程序版本以及更新小程序
@@ -317,7 +318,7 @@ const tools = {
 			success: res => {
 				if(res.data.code==0){
 					res.data.data.v==0 ? uni.setStorageSync('isVedio',false) : uni.setStorageSync('isVedio',true);
-					let appletImg = 'https://oss.hmzfyy.cn' + res.data.data.logo;
+					let appletImg = 'https://dxscrm.scdxtc.com' + res.data.data.logo;
 					uni.setStorageSync('appletImg',appletImg);
 					state.commit('updateAppletImgEv',appletImg);
 				}
@@ -337,14 +338,15 @@ const tools = {
 			// console.log(hInfo.envVersion);//develop:开发版	trial：体验版	release：正式版
 			if(hInfo.miniProgram.envVersion == "develop" || hInfo.miniProgram.envVersion == "trial"){
 				// (开发版,体验版)-配置全局域名
-				uni.setStorageSync('hostapi','https://dxscrm.scdxtc.com/');
+				uni.setStorageSync('hostapi','https://dxscrm.scdxtc.com/api/');
+				this.daoTime();//开启埋点倒计时
 			} else { 
 				// 清除所有输出日志
 				console.log = () =>{};
 				// 正式版-配置全局域名
-				uni.setStorageSync('hostapi','https://dxscrm.scdxtc.com/');
+				uni.setStorageSync('hostapi','https://dxscrm.scdxtc.com/api/');
 				// 开启埋点倒计时
-				// this.daoTime();//开启埋点倒计时
+				this.daoTime();//开启埋点倒计时
 			}
 		// #endif
 	},

main.js

@@ -34,7 +34,6 @@ Vue.component('auth-userInfo-mobileInfo',authUserInfoMobileInfo)//全局注册
 import share from './jsFile/share.js'
 Vue.mixin(share)
 
-Vue.prototype.$hostApi = 'https://oss.hmzfyy.cn';
 // 常用工具
 import tools from '@/jsFile/tools.js'
 Vue.prototype.$toolAll = tools;
@@ -44,7 +43,7 @@ Vue.prototype.$toolAll = tools;
 import requst from '@/jsFile/requst.js'
 Vue.prototype.$requst = requst;
 // 域名，专治后台仔没有返回http/https的图片
-Vue.prototype.$http = 'https://oss.hmzfyy.cn';
+Vue.prototype.$http = 'https://dxscrm.scdxtc.com';
 
 const {log} = console;
 Vue.prototype.$log = log

pages.json

@@ -55,13 +55,6 @@
                     "enablePullDownRefresh": false
                 }
                 
-                }
-                ,{
-                    "path" : "getReadyDan/getReadyDan",
-                    "style" :  {
-						"navigationBarTitleText": "",
-						"enablePullDownRefresh": false
-					}
                 }
 				,{
 				    "path" : "getReadyDan/getReadyDan-two",

pages/tabbar/cate/cate.vue

@@ -4,7 +4,7 @@
 		<status-nav :statusBack="false" :titleVal="'分类'" :statusTitle="true"></status-nav>
 		<view class="disje mar-zy20" :style="{paddingTop: (statusHeight+10)+'px'}">
 			<template v-if="cateList.length!=0">
-				<view class="cate-box" :style="{paddingTop:statusHeight+'px'}" style="overflow: hidden;overflow-y: scroll;">
+				<view class="cate-box" :style="{paddingTop:statusHeight+'px'}" style="overflow: hidden;overflow-y: scroll;width: 24.6%;">
 					<view class="fon26">
 						<view class="mar-s20 flexs" :style="{color : ccurrent==indexc ? publicColor:''}" 
 						:class="ccurrent==indexc?'bold cateActive':'catemo'" 
@@ -12,7 +12,7 @@
 						@tap="chooseCate(indexc)">{{itemc.title}}</view>
 					</view>
 				</view>
-				<view :style="{width:cateW+'px'}" class="flexs" style="height: 10px;"></view>
+				<!-- <view :style="{width:cateW+'px'}" class="flexs" style="height: 10px;"></view> -->
 				<view v-show="isLoading" class="pad-x260" style="width: 74%;">
 					<!-- 热门推荐 --> 
 					<template>
@@ -113,7 +113,7 @@
 								</view>
 							</view>
 							<view v-else class="disjcac fc" style="margin-top: 34%;">
-								<image class="zanw-img" src="/static/public/nothing.png" mode="aspectFill"></image>
+								<image class="zanw-img" src="/static/public/nothing.png" mode="widthFix"></image>
 								<view class="fon24 col3">暂无内容</view>
 							</view>
 						</block>
@@ -205,7 +205,9 @@
 			if(this.total!=this.dataList.length){
 				this.page++
 				if(this.ccurrent==0){
-					this.checkCate(this.category_id)//调用自主预约列表事件
+					if(this.cateListTwo[this.newCurrent].title!='热门商品') {
+						this.checkCate(this.category_id)//调用分类列表事件
+					}
 				} else {
 					this.otherEv(this.cateList[this.ccurrent].children[this.newCurrent].id)
 				}
@@ -235,7 +237,7 @@
 			if(uni.getStorageSync('phone_active')!=0 && uni.getStorageSync('is_active')!=0){
 				this.checkBZ()//调用病种列表事件
 				if(this.ccurrent==0) {
-					if(this.category_id!='') this.checkCate(this.category_id)//调用左侧列表点击事件
+					if(this.category_id!='') this.checkCate(this.category_id)//调用分类列表事件
 				}
 			}
 		},
@@ -309,7 +311,7 @@
 						}
 						this.cateList.unshift(reObj)
 						if(this.ccurrent==0){
-							this.checkCate(this.category_id)//调用热门分类列表事件
+							this.checkCate(this.category_id)//调用分类列表事件
 						} else {
 							this.chooseCate(this.ccurrent);
 							if(this.cateList[this.ccurrent].length) {

pages/tabbar/my/staffDuan.vue

@@ -2,11 +2,10 @@
 	<view>
 		<!-- 状态栏 -->
 		<status-nav :backgroudColor="publicColor" :tabcolor="publicColor"  :statusTitle="true" :statusBack="false"></status-nav>
-		<image src="/static/public/staff-head.png" class="blue-img"></image>
+		<!-- <image src="/static/public/staff-head.png" class="blue-img"></image> -->
-		<view class="mar-zy32 posir pad-x260" :style="{paddingTop:statusHNH+'px'}">
+		<view class="posir gao pad-zy30 mar-x20" :style="{backgroundColor:publicColor,paddingTop:statusHNH+'px'}" style="overflow-x: hidden;">
-			<view class="radius20 posir gao">
+			<view class="" style="position: absolute;width: 1500rpx;height: 500rpx;border-radius: 50%;bottom: -40rpx;z-index: 0;left: 50%;transform: translateX(-50%);" :style="{backgroundColor:publicColor}"></view>
-				<view class="posia" :style="{top:`-${gaoh*0.4}px`,height:gaoh+'px'}"></view>
+			<view class="disjbac posir" style="z-index: 1;">
-				<view class="disjbac">
 				<view class="disac colf">
 					<!-- 头像 -->
 					<image @tap="openXiao" class="mar-sx30" :src="userInfo.headimgurl || ''" mode="aspectFill"></image>
@@ -33,7 +32,7 @@
 					</view>
 				</view>
 			</view>
-				<view class="disjbac posir mar-s40 fon24 pad-zy50" style="z-index: 1;color: #F8CE59;">
+			<!-- <view class="disjbac posir mar-s40 fon24 pad-zy50" style="z-index: 1;color: #F8CE59;">
 				<view>
 					<view class="disac"><span class="bold mar-y20">VIP</span>{{userInfo.level.name}}</view>
 				</view>
@@ -43,9 +42,10 @@
 						<image src="/static/public/next-yellow.png" class="white-next" mode=""></image>
 					</view>
 				</navigator>
+			</view> -->
 		</view>
-			</view>
+		<view class="mar-zy32 posir pad-x260">
-			<view class="disja posir" style="z-index: 1;margin-top: 75rpx;">
+			<view class="disja posir" style="z-index: 1;">
 				<view @tap="chooseone(indext)" class="disac fc flexs width25" v-for="(itemt,indext) in tongList" :key="indext">
 					<view class="fon28 bold mar-sx20 clips1">{{itemt.num}}<text v-if="indext==2">天</text><text v-if="indext==3">人</text></view>
 					<view class="fon28 mar-x25">{{itemt.title}}</view>

pages/tabbar/pagehome/pagehome.vue

@@ -10,9 +10,15 @@
 		</view>
 		<template v-if="isNet">
 			<status-nav :titleVal="'首页'" :backgroudColor="publicColor" :tabcolor="'#FFFFFF'" :statusBack="false" :statusTitle="true" style="opacity: 0;"></status-nav>
+			<view class="pad-x180">
+				<!-- 自定义轮播 -->
+				<view :style="{marginTop: statusHeight+'px'}">
+					<swiper-pu :bannerList="bannerList" :isplay="isAutoPlay"></swiper-pu>
+				</view>
 				<!-- 输入框 -->
-			<view class="input-box posiszy" :style="{top: statusHeight+'px',background:publicColor}" style="height: 60px;display: flex;align-items: center;">
+				<view class="pad-zy30">
-				<view class="disac width100">
+					<view class="input-box radius10 mar-sx20 bacf" style="height: 60px;display: flex;align-items: center;">
+						<view class="disac width100" style="margin: 0 10rpx;">
 							<image class="searchImg flexs" src="/static/public/search.png" mode="aspectFill"></image>
 							<!-- 输入框 -->
 							<input @confirm="searchEv" class="width100 fon34" type="text" v-model="searchVal" placeholder="请输入问题/病种/医生姓名"/>
@@ -22,13 +28,9 @@
 							<view @tap="searchEv" class="searchT flexs fon34" :style="{color:publicColor}">搜索</view>
 						</view>
 					</view>
-			<view class="pad-x180">
-				<!-- 自定义轮播 -->
-				<view :style="{marginTop: (statusHeight+60)+'px'}">
-					<swiper-pu :bannerList="bannerList" :isplay="isAutoPlay"></swiper-pu>
 				</view>
 				<!-- 宫格 -->
-				<view v-if="gonggList.length>1" class="mar-zy30 bacf radius10 pad-s25 mar-s10 disac fw">
+				<view v-if="gonggList.length>1" class="mar-zy30 bacf radius10 pad-s25 disac fw">
 					<view class="disac fc gongg-box mar-x25" style="width: 25%;" @tap="chooseGon(indexgg)" v-for="(itemgg,indexgg) in gonggList" :key="indexgg">
 						<view class="img-box">
 							<image :src="itemgg.src" mode="aspectFill"></image>
@@ -45,7 +47,7 @@
 					</view>
 				</view> -->
 				<!-- 热门搜索 -->
-				<view v-if="isLoading" class="mar-zy30 mar-s50">
+				<view v-if="isLoading && fwList.length" class="mar-zy30 mar-s50">
 					<view class="col2c fon36 bold mar-x36">热门搜索</view>
 					<view class="bacf fon24 disac fw radius20 pad-zy20 pad-s20">
 						<view @tap="chooseReEv(indexf)" v-for="(itemf,indexf) in fwList" :key="indexf" class="disac radius10 mar-x20 reitem-box">

pages/tabbar/shop/shop.vue

@@ -47,7 +47,7 @@
 				<!-- 重置、筛选 -->
 				<view class="disjbac pad-zy20 mar-s50 mar-x30 pad-s20">
 					<view @tap.stop="chongz">重置</view>
-					<view @tap.stop="shaix">筛选</view>
+					<view @tap.stop="shaix" :style="{background:publicColor}">筛选</view>
 				</view>
 			</view>
 		</view>
@@ -151,7 +151,10 @@
 		<navigator url="/pagesA/shopCart/shopCart?isScore=false" hover-class="none">
 			<view class="cart-box">
 				<view class="posir">
-					<image src="/static/public/cart.png" mode="aspectFill"></image>
+					<view class="disjcac" style="width: 112rpx;height: 112rpx;border-radius: 100%" :style="{background:publicColor}">
+						<i class="icon icon-shop-cart colf" style="font-size: 60rpx;"></i>
+					</view>
+					<!-- <image src="/static/public/cart.png" mode="aspectFill"></image> -->
 					<view class="posia" v-if="cartNum!=0"><view>{{cartNum}}</view></view>
 				</view>
 			</view>
@@ -479,6 +482,7 @@
 												}
 											})
 										}
+										uni.hideToast();
 									},1000)
 									setTimeout(()=>{
 										this.dataList = this.zanArr;
@@ -571,6 +575,7 @@
 </script>
 
 <style>
+	@import url("@/commons/icon-font.css");
  page{background: #F5F5F5;}
  .activecate,.shopMo{width: 216rpx;height: 65rpx;border-radius: 20rpx;line-height: 65rpx;text-align: center;background-color: #f2f2f2;color: #333333;}
  .activecate{color: #FFFFFF;}

pagesA/activityTask/activityTask.vue

@@ -10,7 +10,7 @@
 						<image :src="item.imgSrc" style="width: 60rpx;height: 60rpx;margin-right: 20rpx;" mode=""></image>
 						<view class="fon28">{{item.title}}</view>
 					</view>
-					<view><span style="color: #3875F6;">{{item.danc}}</span>/{{item.allc}}</view>
+					<view><span :style="{color: publicColor}">{{item.danc}}</span>/{{item.allc}}</view>
 				</view>
 				<view class="fon24" style="color: #808080;">
 					<view class="mar-s30">活动要求：{{item.description}}</view>
@@ -93,7 +93,11 @@
 		computed:{
 			statusHeight() {
 				return this.$store.state.statusHeight
-			}
+			},
+			// 主题颜色
+			publicColor() {
+				return this.$store.state.publicColor
+			},
 		},
 		onLoad() {},
 		methods: {

pagesA/coupon/coupon.vue

@@ -3,7 +3,10 @@
 		<!-- 状态栏 -->
 		<status-nav :titleVal="'优惠券'" :statusTitle="true"></status-nav>
 		<view id="daoh" class="bacf pad-zy40 pad-sx20 isTopf fon28 col3 disjbac" :style="{top:statusHeight+'px'}">
-			<view @tap="chooseNav(indexn)" :class="isStatus==indexn?'isWen bold':''" class="posir" v-for="(itemn,indexn) in navList" :key="indexn">{{itemn}}</view>
+			<view @tap="chooseNav(indexn)" :class="isStatus==indexn?' bold':''" class="posir" :style="{color: isStatus==indexn ? publicColor : ''}" v-for="(itemn,indexn) in navList" :key="indexn">
+				{{itemn}}
+				<view v-if="isStatus==indexn" class="isWen" :style="{background: publicColor}"></view>
+			</view>
 		</view>
 		<!-- 列表 -->
 		<view :style="{paddingTop: (statusHeight+chuTop+15)+'px'}" class="pad-zy32">
@@ -80,7 +83,11 @@
 		computed:{
 			statusHeight() {
 				return this.$store.state.statusHeight
-			}
+			},
+			// 主题颜色
+			publicColor() {
+				return this.$store.state.publicColor
+			},
 		},
 		onLoad() {
 			const query = wx.createSelectorQuery()
@@ -191,7 +198,7 @@
 
 <style>
 	.isWen{color: #3875F6;}
-	.isWen::after{
+	.isWen{
 		content: '';
 		display: block;
 		height: 8rpx;

pagesA/getReadyDan/getReadyDan-two.vue

@@ -92,8 +92,8 @@
 				<!-- 去支付 -->
 				<view class="fon36 colf8 bold" v-if="isNei!=3">合计：￥{{allPrice<0?0:allPrice}}<span v-if="isKq">+{{zf_kqPrice}}孔雀币</span><span v-if="isExpress && expressInfo.default_price!=0" style="font-size: 24rpx;color: #000;">+ ￥{{expressInfo.default_price}}</span></view>
 				<view class="fon40 colf8 bold dis" v-else><span class="col3 fon28">合计积分：</span>{{allPrice}}<span v-if="isExpress && expressInfo.default_price!=0">+ ￥{{expressInfo.default_price}}</span></view>
-				<view @tap="goPayment" v-if="isNei!=3" class="goPayment">去支付</view>
+				<view @tap="goPayment" v-if="isNei!=3" class="goPayment" :style="{background: publicColor}">去支付</view>
-				<view @tap="isDui=true" v-else class="goPayment">去兑换</view>
+				<view @tap="isDui=true" v-else class="goPayment" :style="{background: publicColor}">去兑换</view>
 			</view>
 		</view>
 		<view v-if="showQuan" @tap.stop="showQuan=false" class="posAll">

pagesA/getReadyDan/getReadyDan.vue

@@ -1,808 +0,0 @@
-<template>
-	<view>
-		<!-- 状态栏 -->
-		<status-nav :titleVal="'购物车'" :statusTitle="true"></status-nav>
-		<view v-if="loading" :style="{paddingTop: statusHeight+'px'}" class="pad-zy30" style="padding-bottom: 150rpx;">
-			<view class="bacf radius20 mar-s20 disjbac pad-sx27-zy20">
-				<view class="bold">配送方式</view>
-				<view class="fon26 col3 disac">
-					<view @tap="expressEv(1)" :class="!isExpress?'activeT':'expressT'"  :style="{background:isExpress?'':publicColor}">自提</view>
-					<view v-if="!isVirtual" @tap="expressEv(0)" :class="isExpress?'activeT':'expressT'" :style="{background:isExpress?publicColor:''}">快递</view>
-				</view>
-			</view>
-			<!-- 地址信息 -->
-			<view v-if="isExpress" class="bacf radius20 mar-s20 pad-sx27-zy20">
-				<view class="bold">收件人信息</view>
-				<navigator url="/pagesA/myAddress/myAddress?isWhere=0" hover-class="none">
-					<view class="fon26 col3 disjbac pad-s50">
-						<view v-if="addressInfo!=''">
-							<view class="fon28 col3 bold mar-x20">{{addressInfo.name}} <span class="mar-z20">{{userPphone}}</span></view>
-							<view class="fon24 col9">{{addressInfo.province_str}}{{addressInfo.city_str}}{{addressInfo.county_str || ''}}{{addressInfo.address || ''}}</view>
-						</view>
-						<view v-else class="fon24 col9">请完善收件人信息</view>
-						<image src="/static/public/nextM.png" class="xiaDan-next" mode="aspectFill"></image>
-					</view>
-				</navigator>
-			</view>
-			<!-- 自提地址 -->
-			<view v-else class="bacf radius20 mar-s20 pad-sx27-zy20">
-				<view class="bold">自提地址</view>
-				<input type="number" maxlength="11" :focus="isFocus" @blur="blurEv" v-model="zPhone" class="mar-s50 mar-x20" style="border: 2rpx solid #E0E0E0;padding: 20rpx;border-radius: 10rpx;font-size: 24rpx;" placeholder="请输入收货人手机号" />
-				<view class="fon26 col3 disjbac">
-					<view>
-						<view class="fon28 col3 bold  mar-x20">Company</view>
-						<view class="fon24 col9">{{goAddress}}</view>
-					</view>
-					<!-- 立即导航 -->
-					<image @tap="goThere(goAddress)" src="/static/public/daoh.png" class="there" mode="aspectFill"></image>
-				</view>
-			</view>
-			<!-- 订单信息 -->
-			<view class="bacf radius20 mar-s20 pad-sx27-zy20">
-				<view class="bold">订单信息</view>
-				<view v-for="(item,index) in orderList" :key="index" class="fon26 col3 disjbac pad-sx50 disjbac bbot">
-					<image lazy-load @tap="goShopDetail(item.id)" :src="item.imgSrc" class="flexs order-image" mode="aspectFill"></image>
-					<view class="width100 disjb fw" style="height: 166rpx;">
-						<view>
-							<view @tap="goShopDetail(item.id)" class="fon28 col3 bold clips2">{{item.title}}</view>
-							<view class="order-sy">{{item.sku_name}}</view>
-						</view>
-						<view class="disjbac mar-s10 width100">
-							<view class="order-item-price" v-if="isNei!=3">￥{{item.price}}</view>
-							<view class="order-item-price" v-else>积分：{{item.price}}</view>
-							<view class="fon28 col6">x{{item.num}}</view>
-						</view>
-					</view>
-				</view>
-				<view class="fon28 disjbac mar-s20 pad-s10">
-					<view class="col6">共{{allNum}}件</view>
-					<view class="bold colf8" v-if="isNei!=3">应付款：{{zanAllPrice}}</view>
-					<view class="bold colf8" v-else>应付款：{{allPrice}}</view>
-				</view>
-			</view>
-			<!-- 选择支付方式 -->
-			<view class="bacf radius20 mar-s20 fon28 col3 pad-sx30 pad-zy20">
-				<view class="bold fon28">选择支付方式</view>
-				<view @tap="chooseFS(index)" v-for="(item,index) in payFS" :key="index" v-if="isCurrent!=index" class="disjbac mar-s30">
-					<view class="disac">
-						<image v-if="item.isActive" src="/static/public/chooseFS.png" class="chooseDX" mode=""></image>
-						<image v-else src="/static/public/cancle-FS.png" class="chooseDX" mode=""></image>
-						<view class="mar-z25">{{item.title}}</view>
-					</view>
-					<view v-if="item.num!=0">余{{item.num}}</view>
-				</view>
-			</view>
-			<!-- 优惠 -->
-			<view v-if="isNei!=3" class="bacf radius20 mar-s20 pad-sx27-zy20">
-				<view class="bold">优惠</view>
-				<view @tap="quanEv(1)" class="fon28 col3 disjbac mar-sx40">
-					<view>优惠券</view>
-					<view class="disac">
-						<view class="colf8 bold">-￥{{youQuan.youPrice}}</view>
-						<image src="/static/public/nextM.png" class="xiaDan-next" mode="aspectFill"></image>
-					</view>
-				</view>
-			</view>
-			<!-- 快递费用 -->
-			<view v-if="isExpress" class="bacf radius20 mar-s20 disjbac pad-sx27-zy20">
-				<view class="bold">快递费用</view>
-				<view class="fon28 colf8 bold">￥{{expressInfo.default_price}}</view>
-			</view>
-			<view class="disjbac posixzy bacf pad-zy32" style="height: 124rpx;line-height: 124rpx;">
-				<!-- 去支付 -->
-				<view class="fon36 colf8 bold" v-if="isNei!=3">合计：￥{{allPrice<0?0:allPrice}}<span v-if="isKq">+{{zf_kqPrice}}孔雀币</span><span v-if="isExpress && expressInfo.default_price!=0" style="font-size: 24rpx;color: #000;">+ ￥{{expressInfo.default_price}}</span></view>
-				<view class="fon40 colf8 bold dis" v-else><span class="col3 fon28">合计积分：</span>{{allPrice}}<span v-if="isExpress && expressInfo.default_price!=0">+ ￥{{expressInfo.default_price}}</span></view>
-				<view @tap="goPayment" v-if="isNei!=3" class="goPayment">去支付</view>
-				<view @tap="isDui=true" v-else class="goPayment">去兑换</view>
-			</view>
-		</view>
-		<view v-if="showQuan" @tap.stop="showQuan=false" class="posAll">
-			<view class="bacf posixzy" style="border-radius: 40rpx 40rpx 0rpx 0rpx;" @tap.stop="showQuan=true">
-				<view class="pad-sx20 pad-zy50">
-					<view class="disjbac">
-						<view class="fon28 bold col3">可用优惠券({{quanList.length}})</view>
-						<image @tap.stop="showQuan=false" src="/static/public/cha-close.png" style="width: 30rpx;height: 30rpx;" mode="aspectFill"></image>
-					</view>
-					<!-- <view class="fon28 bold col3 disja pad-s50" style="padding-bottom: 16rpx;">
-						<view class="posir" :class="switchQuan?'activeQuan':''" @tap="switchQuan=true">可用优惠券(1)</view>
-						<view class="posir" :class="!switchQuan?'activeQuan':''" @tap="switchQuan=false">失效优惠券(0)</view>
-					</view> -->
-					<scroll-view scroll-y class="mar-s40 quan-list-box">
-						<view @tap.stop="chooseQuan(index)" v-for="(item,index) in quanList" :key="index" class="mar-x40">
-							<view class="disjbac quan-item-box">
-								<view class="posir">
-									<image class="posia" src="/static/public/quan-left.png" mode=""></image>
-									<view class="posir" style="z-index: 1;">
-										<view class="pad-s40 pad-x30 fon28">￥<span class="bold fon56">{{item.youPrice}}</span></view>
-										<view class="fon24" style="padding-left: 12rpx;">满{{item.manPrice}}元可使用</view>
-									</view>
-								</view>
-								<view>
-									<!-- <view class="fon28 col3 mar-s20">{{['黄金','白银'][item.isGrade]}}会员专属优惠券</view> -->
-									<view class="fon28 col3 mar-s20">{{item.name}}</view>
-									<view>
-										<image v-if="item.isStatus" src="/static/public/chooseQuan.png"></image>
-										<image v-else src="/static/public/cancleQuan.png"></image>
-									</view>
-									<view class="fon20 col3 mar-x20">有效期：{{item.startTime.slice(0,10)}}至{{item.endTime.slice(0,10)}}</view>
-								</view>
-							</view>
-						</view>
-					</scroll-view>
-					<!-- 领取优惠券按钮 -->
-					<view @tap.stop="goCoupon" class="ling-btn">领取优惠券</view>
-				</view>
-			</view>
-		</view>
-		<!-- 确认兑换弹框 -->
-		<view v-if="isDui" @tap.stop="isDui=false" class="posAll zhun-dui-box">
-			<view class="bacf radius20 width100 tc fon28 col3 pad20" @tap.stop="isDui=true">
-				<view class="bold" style="margin: 0rpx 0 56rpx 0;">兑换商品</view>
-				<view style="margin: 0rpx 0 66rpx 0;">您确定使用{{allPrice}}积分兑换吗？</view>
-				<view class="disjbac mar-x20 pad-zy20 zhun-dui-btn">
-					<view @tap.stop="isDui=false">暂不兑换</view>
-					<view @tap.stop="goPayment">立即兑换</view>
-				</view>
-			</view>
-		</view>
-		<!-- 支付成功 -->
-		<view v-if="isSuccess" class="posAll" :style="{top:statusHeight+'px'}" style="z-index: 3;background-color: #F5F5F5;">
-			<view class="bacf radius20 mar-s20 mar-zy20 success-box">
-				<image src="/static/public/pay-success.png" mode=""></image>
-				<view class="fon28 col3 pad-s20 pad-x40">支付成功</view>
-				<view class="success-hj"><span v-if="isNei!=3">￥{{jsPrice<0?0:jsPrice}}</span><span v-else>合计：{{jsPrice}}</span></view>
-				<view class="disja success-btn">
-					<view @tap="goDetail">查看订单</view>
-					<view @tap="goShop" class="colf" :style="{background:publicColor}">再逛一逛</view>
-				</view>
-			</view>
-		</view>
-		<!-- 分享弹框 -->
-		<view v-if="isfen" class="posAll disjcac" style="background-color: rgba(0,0,0,.25);z-index: 8;">
-			<view class="bacf width100 radius20 posir" style="padding: 60rpx 50rpx;margin: 0 70rpx;text-align: center;">
-				<image @tap="isfen=false" src="../../static/public/closequan.png" class="posia heyan-close" mode=""></image>
-				<view style="color: #f55255;font-size: 36rpx;">立即完成拼单?</view>
-				<view style="margin: 50rpx 0;font-size: 26rpx;">点击下方分享给朋友，完成拼单</view>
-				<view class="posir radius15 disjcac pad-sx20" style="background-color: #22cc3e;color: #FFFFFF;font-size: 36rpx;">
-					分享给朋友
-					<button open-type="share" class="posia-op">分享给朋友</button>
-				</view>
-			</view>
-		</view>
-		<!-- 用户信息授权，手机号授权 -->
-		<auth-userInfo-mobileInfo></auth-userInfo-mobileInfo>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				isExpress:false,
-				switchQuan:true,
-				showQuan:false,//是否显示优惠券弹框
-				isDui:false,
-				orderList:uni.getStorageSync('orderList'),
-				quanList:[],
-				goAddress:'四川省成都市成华区双店路B口',
-				youQuan:{
-					id:0,
-					youPrice:0
-				},//优惠券
-				allPrice:0,//合计
-				allNum:0,//总数量
-				zanAllPrice:0,//暂存合计
-				isNei:0,
-				expressInfo:{},//快递信息
-				addressInfo:'',//地址信息
-				userPphone:'请完善信息',
-				zPhone:'',//自提时的手机号
-				page:1,
-				size:10,
-				isFocus:false,
-				loading:false,
-				zf_allPrice:0,//实际付款
-				zf_kqPrice:0,//孔雀币
-				payFS:[
-					{title:'微信支付',isActive:true,num:0},
-					{title:'孔雀币',isActive:false,num:100},
-					{title:'积分',isActive:false,num:100},
-				],
-				isKq:false,
-				jsPrice:0,//结算时的金额,
-				zc_allPrice:0,//暂存实际总金额
-				coin_price:0,//孔雀币转换后的元
-				isSuccess:false,//支付成功
-				ntype:'money',//默认money孔雀币转钱 coin钱转孔雀币
-				times:0,//点击次数
-				isCurrent:2,
-				isfen:false,
-				checkGrounpId:0,
-				expressInfo:{
-					default_price:0
-				},
-				isVirtual:false,//是否是虚拟商品
-				payType:''//支付方式 wechat=微信支付;coin=孔雀币;hybrid=混合支付
-			}
-		},
-		computed: {
-			// 主题颜色
-			publicColor() {
-				return this.$store.state.publicColor
-			},
-			statusHeight() {
-				return this.$store.state.statusHeight
-			}
-		},
-		onShareAppMessage(res) {
-			var shareObj = {
-		　　　　	title: this.orderList[0].title, // 默认是小程序的名称(可以写slogan等)
-		　　　　	path: `/pagesB/shopDetail/shopDetail?id=${this.orderList[0].id}&category_id=0&is_activity=${this.orderList[0].is_activity}&share_id=${uni.getStorageSync('userId')}&invite_code=${uni.getStorageSync('invite_code')}`, // 默认是当前页面，必须是以‘/’开头的完整路径
-		　　　　	imageUrl: this.orderList[0].imgSrc//自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
-		　	};
-		　　return shareObj;
-		// 　　return false;
-		},
-		onShow() {
-			// 禁止分享
-			this.$toolAll.tools.disableShareEv();
-			this.checkChoose();//检测地址
-			uni.removeStorageSync('orderInfo');
-		},
-		onLoad(options) {
-			// wechat=微信支付;coin=孔雀币;hybrid=混合支付
-			this.payType = uni.getStorageSync('payType'); 
-			// this.payType = 'coin';
-			if(this.payType=='wechat') {
-				this.payFS = [{title:'微信支付',isActive:true,num:0}]
-			} else if(this.payType=='coin'){
-				this.payFS = [{title:'孔雀币',isActive:true,num:0}]
-			} else if(this.payType=='hybrid'){
-				this.payFS = [
-					{title:'微信支付',isActive:true,num:0},
-					{title:'孔雀币',isActive:false,num:0}
-				]
-			}
-			// 自提手机号
-			this.zPhone = uni.getStorageSync('phone');
-			// 判断是不是虚拟商品
-			options.isVirtual == "virtual" ? this.isVirtual = true : this.isVirtual = false 
-			this.checkexpress();//查询快递
-			this.checkeList(options.isNei);//查询订单列表
-			this.checkOrderDetail();//查询订单信息
-			this.isNei = options.isNei;
-			if(this.isNei==3) {
-				this.payFS[0].isActive = false;
-				this.payFS[2].isActive = true;
-				this.isCurrent = 1;
-			} 
-		},
-		methods: {
-			checkChoose(){
-				if(uni.getStorageSync('chooseAddress')==''){
-					this.checkAddress();//查询地址
-				} else {
-					let naddress = uni.getStorageSync('chooseAddress');
-					this.addressInfo = {
-						id:naddress.id,
-						name:naddress.userName,
-						phone:naddress.userPhone,
-						province_str:naddress.province,
-						city_str:naddress.city,
-						county_str:naddress.county,
-						address:naddress.address
-					}
-					this.userPphone = this.$toolAll.tools.hideMPhone(naddress.userPhone);
-				}
-			},
-			obtainCoin(coinNum){//获取当前账户孔雀币
-				this.$requst.post('user/get-coin-price',{amount:coinNum,get_type:this.ntype}).then(res=>{
-					if(res.code==0){
-						if(this.ntype=='money'){
-							this.coin_price = res.data.amount/100;
-							if(this.payType=='coin'){
-								// 只有孔雀币支付方式
-								if(this.zanAllPrice - this.coin_price<=0){//孔雀币足以抵扣
-									this.allPrice = 0;
-									this.zf_kqPrice = this.zanAllPrice*1;
-								} else {//孔雀币不足以抵扣
-									this.allPrice = (this.$toolAll.tools.addXiaoShu(this.zanAllPrice - this.coin_price)*1).toFixed(2);
-									this.zf_kqPrice = this.coin_price;
-								}
-								this.isKq = true;
-							}
-						} else {
-							this.zf_kqPrice = res.data.amount;
-							this.isKq = true;
-						}
-					}
-				})
-			},
-			goShopDetail(id){
-				uni.navigateTo({
-					url:`/pagesB/shopDetail/shopDetail?id=${id}`
-				})
-			},
-			chooseFS(index){
-				this.payFS[index].isActive = !this.payFS[index].isActive;
-				if(this.isNei==3){//积分
-					if(!this.payFS[0].isActive && !this.payFS[2].isActive){
-						this.$toolAll.tools.showToast('请选择支付方式');
-						this.allPrice = this.zanAllPrice;
-						this.isKq = false;
-						return;
-					}
-				} else {//孔雀币
-					if(this.payType!='coin'){
-						if(!this.payFS[0].isActive && !this.payFS[1].isActive){
-							this.$toolAll.tools.showToast('请选择支付方式')
-							this.allPrice = this.zanAllPrice;
-							this.isKq = false;
-							this.zf_kqPrice = this.payFS[1].num;
-							return;
-						}
-					}
-				}
-				if(this.payFS[index].title=='微信支付'){
-					if(this.isNei!=3){
-						//选择了微信支付+选择了孔雀币
-						if(this.payFS[0].isActive && this.payFS[1].isActive){
-							if(this.zanAllPrice - this.coin_price >=0){//孔雀币不足以抵扣
-								this.allPrice = this.$toolAll.tools.addXiaoShu(this.zanAllPrice - this.coin_price);
-								this.zf_kqPrice = this.payFS[1].num;
-							} else {//孔雀币足以抵扣
-								this.allPrice = 0;
-								this.ntype = 'coin';
-								this.obtainCoin(this.zanAllPrice*100);
-							}
-							return;
-						}
-						//取消了微信支付+选择了孔雀币
-						if(!this.payFS[0].isActive && this.payFS[1].isActive){
-							if(this.zanAllPrice - this.coin_price>0){
-								this.$toolAll.tools.showToast('孔雀币不足');
-							}
-							return;
-						}
-						//选择了微信支付+取消了孔雀币
-						if(this.payFS[0].isActive && !this.payFS[1].isActive){
-							this.isKq = false;
-							this.zf_kqPrice = 0;
-							return;
-						}
-					} else {
-						if(this.expressInfo.default_price==0){
-							this.$toolAll.tools.showToast('暂不可微信支付');
-							this.payFS[index].isActive = false;
-						}
-					}
-				}
-				if(this.payFS[index].title=='孔雀币') {
-					if(this.payType!='coin'){
-						if(this.youQuan.youPrice!=0){
-							this.payFS[1].isActive = false;
-							this.$toolAll.tools.showToast('无法使用孔雀币支付');
-						} else {
-							if(this.coin_price!=0){
-								//选择了微信支付+选择了孔雀币
-								if(this.payFS[0].isActive && this.payFS[1].isActive) {
-									if(this.zanAllPrice - this.coin_price<=0){//孔雀币足以抵扣
-										this.ntype = 'coin';
-										this.obtainCoin(this.zanAllPrice*100);
-										this.allPrice = 0;
-									} else {//孔雀币不足以抵扣
-										this.allPrice = (this.$toolAll.tools.addXiaoShu(this.zanAllPrice - this.coin_price)*1).toFixed(2);
-										this.zf_kqPrice = this.payFS[1].num;
-									}
-									return;
-								}
-								//选择了微信支付+取消了孔雀币
-								if(this.payFS[0].isActive && !this.payFS[1].isActive) {
-									this.isKq = false;
-									this.zf_kqPrice = 0;
-									// 如果优惠券金额等：0
-									if(this.youQuan.youPrice==0){
-										this.allPrice = (this.$toolAll.tools.addXiaoShu(this.zanAllPrice)*1).toFixed(2);
-									} else {
-										this.allPrice = (this.$toolAll.tools.addXiaoShu(this.zanAllPrice - this.youQuan.youPrice)*1).toFixed(2);
-									}
-									return;
-								}
-								//取消了微信支付+选择了孔雀币
-								if(!this.payFS[0].isActive && this.payFS[1].isActive){
-									if(this.zanAllPrice - this.coin_price<=0){//孔雀币足以抵扣应付款
-										this.ntype = 'coin'
-										this.obtainCoin(this.allPrice*100);
-										this.allPrice = 0;
-									}
-									if(this.zanAllPrice - this.coin_price>0){//孔雀币不足以抵扣应付款
-										this.$toolAll.tools.showToast('孔雀币不足')
-										this.allPrice = (this.$toolAll.tools.addXiaoShu(this.zanAllPrice - this.coin_price)*1).toFixed(2);
-										this.zf_kqPrice = this.payFS[1].num;
-									}
-									return;
-								}
-								//取消了微信支付+取消了孔雀币
-								if(!this.payFS[0].isActive && !this.payFS[1].isActive){
-									this.isKq = false;
-									this.allPrice = (this.$toolAll.tools.addXiaoShu(this.zanAllPrice)*1).toFixed(2);
-									return;
-								}
-							} else {
-								this.$toolAll.tools.showToast('暂无可用孔雀币');
-								this.payFS[index].isActive = false;
-							}
-						}
-					} else {
-						if(!this.payFS[index].isActive) {
-							this.isKq = false;
-							this.zf_kqPrice = 0;
-							this.allPrice = this.zanAllPrice;
-						} else {
-							// 只有孔雀币支付方式
-							if(this.zanAllPrice - this.coin_price<=0){//孔雀币足以抵扣
-								this.ntype = 'coin';
-								this.obtainCoin(this.zanAllPrice*100);
-								this.allPrice = 0;
-							} else {//孔雀币不足以抵扣
-								this.allPrice = (this.$toolAll.tools.addXiaoShu(this.zanAllPrice - this.coin_price)*1).toFixed(2);
-								this.zf_kqPrice = this.payFS[0].num;
-							}
-						}
-					}
-					
-				}
-			},
-			goPayment(){//去付款
-				this.isFocus = false;
-				this.isDui = false;
-				let nphone = '';
-				if(this.isExpress) {
-					nphone = this.addressInfo.phone;//默认地址的手机号
-				} else nphone = this.zPhone;//自提时的手机号
-				let self = 0;//快递的配送方式
-				if(!this.isExpress) self = 1;//自提的方式
-				let nsku_list = [];
-				let is_only = 0;
-				this.orderList.forEach(item=>{
-					let obj = {
-						sku_coding:item.coding,
-						num:item.num,
-						group_id:item.pin_user_id
-					}
-					nsku_list.push(obj);
-					is_only = item.is_only;
-				})
-				let is_score = 0;
-				if(this.isNei == 3) {is_score = 1}
-				if(this.zf_kqPrice!=0) {
-					this.jsPrice = `${this.allPrice} +${this.zf_kqPrice}孔雀币`;
-				} else {
-					this.jsPrice = this.allPrice;
-				}
-				let parmas = {
-					sku_list: nsku_list,//商品单号和数量数组
-					total: this.allPrice*100,//总金额
-					address_id: this.addressInfo.id || 0,//地址ID
-					express_code: this.expressInfo.code || 0,//快递编码
-					coupon_id: this.youQuan.id,//优惠券ID
-					coupon_price: this.youQuan.youPrice*100,//优惠券可用
-					pick_self: self,//是否自提0 快递， 1自提
-					pick_self_phone: nphone,//联系电话
-					original_total: this.zanAllPrice*100,//原价总金额
-					freight: this.expressInfo.default_price || 0,//快递费
-					remarks: "",//备注
-					is_only:is_only,//是否是单独购买0 不是单独购买1，2是单独购买
-					is_score:is_score,//是否是积分商品0 不是积分商品，1是积分商品
-					coin:this.zf_kqPrice//孔雀币
-				}
-				if(this.addressInfo=='' && self!=1){
-					this.$toolAll.tools.showToast('请完善收件人信息');
-				} else if(nphone=='') {
-					this.$toolAll.tools.showToast('请填写收货人手机号');
-					this.focusEv();
-				} else if(this.$toolAll.tools.isPhone(nphone)) {
-					this.$toolAll.tools.showToast('请正确填写收货人手机号');
-					this.focusEv();
-				} else if(this.isNei == 3 && !this.payFS[2].isActive){//积分判断条件
-					this.$toolAll.tools.showToast('请选择积分付款方式');
-				} else if(this.isNei == 3 && this.expressInfo.default_price!=0 && this.expressInfo.default_price!=undefined && !this.payFS[0].isActive){//积分判断条件
-					this.$toolAll.tools.showToast('请添加微信支付方式');
-				} else if(this.isNei != 3 && !this.payFS[0].isActive && !this.payFS[1].isActive){
-					this.$toolAll.tools.showToast('请选择支付方式')
-				} else if(this.payType=='coin' && this.allPrice*1 > this.coin_price*1){
-					this.$toolAll.tools.showToast('孔雀币不足');
-				} else if(this.payType=='hybrid' && this.isNei != 3 && !this.payFS[0].isActive && this.allPrice*1 > this.coin_price*1){
-					this.$toolAll.tools.showToast('孔雀币不足');
-				} else {
-					if(this.times==0){
-						this.times++;
-						if(this.allPrice==0){
-							this.$toolAll.tools.showToast('正在支付','loading',1500);
-						} else {
-							this.$toolAll.tools.showToast('正在调起支付','loading',1500);
-						}
-						uni.request({
-							url:`${getApp().globalData.hostApi}order/create`,
-							data:parmas,
-							method:'post',
-							header:{
-								'Content-Type': 'application/json; charset=UTF-8',
-								'Authorization': 'Bearer '+uni.getStorageSync('token') || ''
-							},
-							success: (res) => {
-								if(res.data.code==0){
-									this.times = 0;
-									this.payment(res.data.data);
-									// uni.setStorageSync('orderList',this.orderList);
-									// uni.setStorageSync('orderInfo',res.data.data);
-									// uni.navigateTo({
-									// 	url:`/pagesA/immediatePayment/immediatePayment?allPrice=${this.allPrice}&allNum=${this.allNum}&startTime=${new Date(res.header.Date).getTime()}`
-									// })
-								} else {
-									this.$toolAll.tools.showToast(res.data.msg,'none',3000);
-									this.times = 0;
-								}
-							}
-						})
-					}
-				}
-			},
-			payment(info){
-				if(info.needPay){
-					uni.requestPayment({
-						provider: 'wxpay',
-						appId:info.payment_params.appId,//appId
-						timeStamp: info.payment_params.timeStamp,//时间戳
-						nonceStr: info.payment_params.nonceStr,//随机字符串
-						package: info.payment_params.package,//package
-						signType: info.payment_params.signType,//MD5
-						paySign: info.payment_params.sign,//签名
-						success:(res)=> {
-							this.$requst.post('order/paid',{order_coding:info.coding}).then(res=>{
-								if(res.code==0){
-									this.suseeceEv(info.coding);
-								} else this.$toolAll.tools.showToast(res.msg);
-							})
-						},
-						fail:()=> {
-							this.$toolAll.tools.showToast('取消支付');
-							setTimeout(()=>{
-								uni.navigateTo({
-									url:'/pagesA/myOrder/myOrder'
-								})
-							},2000)
-						}
-					});
-				} else {
-					this.$requst.post('order/paid',{order_coding:info.coding}).then(res=>{
-						if(res.code==0){
-							this.suseeceEv(info.coding);
-						} else this.$toolAll.tools.showToast(res.msg);
-					})
-				}
-			},
-			suseeceEv(coding){
-				uni.removeStorageSync('chooseAddress')
-				this.isSuccess = true;
-				if(this.orderList[0].cateNum==1 && this.orderList.pin_user_id!=0){
-					this.isfen = true;
-					this.$requst.post('order/get-group-id',{order_coding:coding}).then(res=>{
-						if(res.code==0){
-							this.checkGrounpId = res.data.group_id;
-						}
-					})
-				}
-			},
-			goThere(val){//去这里
-				wx.getLocation({//获取当前经纬度
-				    type: 'wgs84', //返回可以用于wx.openLocation的经纬度，官方提示bug: iOS 6.3.30 type 参数不生效，只会返回 wgs84 类型的坐标信息  
-					success: function (res) {
-						wx.openLocation({//​使用微信内置地图查看位置。
-							latitude: getApp().globalData.latitude,//要去的纬度-地址
-							longitude: getApp().globalData.longitude,//要去的经度-地址
-							name: val,
-							address: val
-						})
-					}
-				})
-			},
-			checkAddress(){//默认地址查询
-				this.$requst.post('user/address').then(res=>{
-					if(res.code==0){
-						if(res.data.length!=0){
-							res.data.forEach(item=>{
-								if(item.is_default==1) {
-									this.addressInfo = item;
-								} else {
-									if(res.data.length==1){
-										this.addressInfo = item;
-									}
-								}
-							})
-							this.userPphone = this.$toolAll.tools.hideMPhone(this.addressInfo.phone);
-						}
-					}
-				})
-			},
-			checkexpress(){//查询快递费
-				if(this.isExpress) {
-					this.$requst.post('common/express-list').then(res=>{
-						if(res.code==0){
-							if(res.data.length!=0){
-								res.data.forEach(item=>{
-									if(item.is_default==1){
-										this.expressInfo = item;
-										this.expressInfo.default_price = this.expressInfo.default_price/100;
-									}
-								})
-								this.totalEv();
-							}
-						}
-					})
-				}
-			},
-			expressEv(index){//快递自取切换事件
-				if(index==0) {
-					this.isExpress = true;
-					this.checkexpress();
-					if(this.addressInfo==''){this.$toolAll.tools.showToast('请完善收件人信息','none',1500);}
-				}
-				if(index==1) {
-					this.isExpress = false;
-					this.expressInfo.default_price = 0;
-				}
-			},
-			totalEv(){//合计运算
-				if(this.isNei!=3) {
-					// 商品订单合计
-					this.allPrice = this.zanAllPrice - this.youQuan.youPrice;
-					if(this.payType=='coin'){
-						this.obtainCoin(this.payFS[0].num);
-					}
-				} else {
-					// 积分订单合计
-					this.allPrice = this.zanAllPrice;
-				}
-				this.loading = true;
-			},
-			checkOrderDetail(){//查询订单准备信息
-				let nsku_list = [];
-				this.orderList.forEach(item=>{
-					let obj = {
-						sku_coding:item.coding,
-						num:item.num
-					}
-					nsku_list.push(obj)
-				})
-				let parmas = {
-					sku_list: nsku_list,
-					pick_self: 0
-				}
-				this.$requst.post('order/prepare-info',parmas).then(res=>{
-					if(res.code==0){
-						this.obtainCoin(res.data.account.coin);
-						if(this.payType=='coin'){
-							this.payFS[0].num = res.data.account.coin;
-						} else if(this.payType=='wechat'){
-							
-						} else {
-							this.payFS[1].num = res.data.account.coin;
-							this.payFS[2].num = res.data.account.score;
-						}
-					} else this.$toolAll.tools.showToast(res.msg);
-				})
-			},
-			checkeList(isJfen){
-				this.allPrice = this.allPrice*1;
-				this.orderList.forEach(item=>{
-					this.allPrice += item.price*item.num;
-					this.allNum += item.num;
-				})
-				if(isJfen==3){// 是积分商品
-					this.zanAllPrice = this.allPrice;
-				} else {
-					this.zanAllPrice = this.$toolAll.tools.addXiaoShu(this.allPrice);
-				}
-				this.quanEv(0);//查询优惠券列表
-				this.totalEv();
-			},
-			quanEv(index){//调起优惠券弹框事件
-				if(this.payType!='coin' && this.payType!='wechat'){
-					if(this.payFS[1].isActive){
-						this.$toolAll.tools.showToast('无法使用优惠券减免');
-						// this.allPrice = this.$toolAll.tools.addXiaoShu(this.zanAllPrice*1 + this.expressInfo.default_price*1);
-					} else {
-						if(index==1){
-							this.showQuan = true
-						}
-						this.youQuan.id = 0;
-						this.youQuan.youPrice = 0;
-						this.allPrice = (this.zanAllPrice*1 - this.expressInfo.default_price*1).toFixed(2);
-						this.checkQuan();//查询可用优惠券事件
-					}
-				}
-			},
-			checkQuan(){//查询可用优惠券事件
-				this.$requst.post('user/get-coupon-list',{status:'normal',page:this.page,size:this.size}).then(res=>{
-					if(res.code==0){
-						this.quanList = [];
-						if(res.data.length!=0){
-							res.data.forEach(item=>{
-								if(item.type!='taste'){//如果不等于体验券
-									let obj = {
-										id:item.id,
-										youPrice:item.amount/100,
-										manPrice:item.condition/100,
-										isGrade:0,
-										name:item.name,
-										startTime:item.begin_at,
-										endTime:item.end_at,
-										isStatus:false
-									}
-									this.quanList.push(obj);
-								}
-							})
-						}
-					}
-				})
-			},
-			chooseQuan(index){//选择可用优惠券事件
-				if(this.zanAllPrice <= this.quanList[index].manPrice){//如果满减大于合计
-					this.$toolAll.tools.showToast('未达到使用条件')
-				} else {
-					if(this.allPrice==0){
-						this.$toolAll.tools.showToast('此订单费用为 0');
-						// this.$requst.post('user/get-coin-price',{amount:this.quanList[index].youPrice,get_type:'coin'}).then(res=>{
-						// 	if(res.code==0){
-						// 		this.zf_kqPrice = this.zf_kqPrice - res.data.amount;
-						// 		this.showQuan = false;
-						// 	}
-						// })
-					} else {
-						this.quanList.forEach(item=>{
-							item.isStatus = false;
-						});
-						this.quanList[index].isStatus = true;
-						this.showQuan = false;
-						this.quanList[index].youPrice = this.$toolAll.tools.addXiaoShu(this.quanList[index].youPrice);
-						this.youQuan = this.quanList[index];
-						this.allPrice = this.zanAllPrice*1 - this.quanList[index].youPrice*1 + this.expressInfo.default_price*1;//合计 = 暂存合计 - 选中的优惠券
-						this.allPrice = this.allPrice.toFixed(2)*1;
-					}
-				}
-			},
-			goCoupon(){//去领取优惠券
-				this.showQuan = false;
-				uni.navigateTo({
-					url:'/pagesA/coupon/coupon'
-				})
-			},
-			focusEv(){//获取焦点
-				this.isFocus = true;
-			},
-			blurEv(){//失去焦点
-				this.isFocus = false;
-			},
-			goDetail(){//去订单列表
-				uni.navigateTo({
-					url:'/pagesA/myOrder/myOrder'
-				})
-			},
-			goShop(){//逛一逛
-				let nurl = '';
-				if(this.isNei==3) nurl = '/pagesA/pointsMall/pointsMall';
-				else nurl = '/pages/tabbar/shop/shop';
-				uni.reLaunch({
-					url:nurl
-				})
-			}
-		}
-	}
-</script>
-
-<style>
-	page {
-		background-color: #F5F5F5;
-	}
-</style>

pagesA/myAddress/myAddress.vue

@@ -22,7 +22,7 @@
 						</view>
 					</view>
 				</view>
-				<view @tap.stop="obtainLngLat" class="posixzy address_add" style="bottom: 20rpx;">添加地址</view>
+				<view @tap.stop="obtainLngLat" class="posixzy address_add" style="bottom: 20rpx;" :style="{background: publicColor}">添加地址</view>
 				<view style="margin-top: 50%;">
 					<nothing-page v-if="dataList.length==0" :content="'暂无可用地址'"></nothing-page>
 				</view>
@@ -82,7 +82,7 @@
 						<input type="text" class="width100" v-model="userAddress" placeholder="请输入详细地址" />
 					</view>
 					<!-- 确认保存按钮 -->
-					<view @tap.stop="addAddress" class="address-btn-add">确认保存</view>
+					<view @tap.stop="addAddress" class="address-btn-add" :style="{background: publicColor}">确认保存</view>
 				</view>
 			</view>
 		</view>
@@ -116,7 +116,11 @@
 		computed: {
 			statusHeight() {
 				return this.$store.state.statusHeight
-			}
+			},
+			// 主题颜色
+			publicColor() {
+				return this.$store.state.publicColor
+			},
 		},
 		onShow() {
 			// 禁用小程序分享

pagesA/myOrder/myOrder.vue

@@ -6,7 +6,10 @@
 		<view class="isTopf bacf pad-zy30" :style="{top:statusHeight+'px'}">
 			<scroll-view scroll-x>
 				<view id="daoh" class="disjbac pad-s20">
-					<view @tap="chooseNav(indexn)" class="posir pad-s20 pad-zy20 pad-x30 flexs mar-y10" style="text-align: center;" :class="activeIndex==indexn?'activeD':''" :style="{color:activeIndex==indexn?'#3875F6':'#000000'}" v-for="(itemn,indexn) in statusList" :key="indexn">{{itemn}}</view>
+					<view @tap="chooseNav(indexn)" class="posir pad-s20 pad-zy20 pad-x30 flexs mar-y10" style="text-align: center;" :style="{color:activeIndex==indexn?publicColor:'#000000'}" v-for="(itemn,indexn) in statusList" :key="indexn">
+						{{itemn}}
+						<view v-if="activeIndex==indexn" class="activeD" :style="{background: publicColor}"></view>
+					</view>
 				</view>
 			</scroll-view>
 		</view>
@@ -180,7 +183,11 @@
 			},
 			statusHeight() {
 				return this.$store.state.statusHeight
-			}
+			},
+			// 主题颜色
+			publicColor() {
+				return this.$store.state.publicColor
+			},
 		},
 		onShareAppMessage(res) {
 			var shareObj = {
@@ -475,7 +482,7 @@
 </script>
 
 <style>
-	.activeD::after{
+	.activeD{
 		content: '';
 		display: block;
 		position: absolute;

pagesA/pointsMall/pointsMall.vue

@@ -32,7 +32,9 @@
 		<navigator url="/pagesA/shopCart/shopCart?isScore=score" hover-class="none">
 			<view class="cart-box">
 				<view class="posir">
-					<image src="/static/public/cart.png" mode="aspectFill"></image>
+					<view class="disjcac" style="width: 112rpx;height: 112rpx;border-radius: 100%" :style="{background:publicColor}">
+						<i class="icon icon-shop-cart colf" style="font-size: 60rpx;"></i>
+					</view>
 					<view class="posia" v-if="cartNum!=0"><view>{{cartNum}}</view></view>
 				</view>
 			</view>
@@ -142,8 +144,6 @@
 								}
 								this.dataList.push(obj)
 							})
-						} else {
-							this.$toolAll.tools.showToast('暂无更多积分商品')
 						}
 					}
 				})
@@ -186,6 +186,7 @@
 </script>
 
 <style>
+	@import url("@/commons/icon-font.css");
  page{background: #F5F5F5;}
  .activecate,.shopMo{border-radius: 20rpx;text-align: center;background-color: #f2f2f2;color: #333333;padding: 16rpx 25rpx;width: 100rpx;}
  .activecate{color: #FFFFFF;}

pagesA/shopCart/shopCart.vue

@@ -35,11 +35,11 @@
 					<view v-if="showDel && isDang==index" @tap="deltItem(index)" class="item-del-btn">删除</view>
 				</view>
 			</view>
-			<nothing-page v-if="cartList.length==0" :content="'暂无更多商品'"></nothing-page>
+			<nothing-page v-if="cartList.length==0" :content="' '"></nothing-page>
 			<view class="disjbac posixzy bacf pad-zy32" style="height: 124rpx;line-height: 124rpx;">
 				<view class="disac" @tap="chooseAll">
-					<view class="chooseAll-box">
+					<view class="chooseAll-box" :style="{border:`2rpx solid ${publicColor}`}">
-						<view v-if="isChooseAll"></view>
+						<view v-if="isChooseAll" :style="{background: publicColor}" ></view>
 					</view>
 					<view class="fon28 col3 mar-z10">全选</view>
 				</view>
@@ -49,10 +49,10 @@
 						<view class="fon28" v-if="isScore!='score'">合计：<span class="fon40 bold colf8">￥{{allPrice}}</span></view>
 						<view class="fon28" v-else>合计：<span class="fon40 bold colf8">{{allPrice}}</span></view>
 					</view>
-					<view @tap="goGetReadyDan" class="colf fon30 bold mar-z10 goBuy-btn" style="background: #3875F6;">{{cartList.length==0?'去购物':'去支付'}}</view>
+					<view @tap="goGetReadyDan" class="colf fon30 bold mar-z20 goBuy-btn" :style="{background: publicColor}">{{cartList.length==0?'去购物':'去支付'}}</view>
 				</view>
 				<!-- 删除 -->
-				<view @tap="delBtn" v-else class="colf fon28 bold goBuy-btn" style="background: #F85050;">删除</view>
+				<view @tap="delBtn" v-else class="colf fon28 bold goBuy-btn" :style="{background: publicColor}">删除</view>
 			</view>
 		</view>
 		<!-- 用户信息授权，手机号授权 -->
@@ -79,15 +79,6 @@
 				timeout:null
 			}
 		},
-		computed: {
-			// 主题颜色
-			publicColor() {
-				return this.$store.state.publicColor
-			},
-			statusHeight() {
-				return this.$store.state.statusHeight
-			}
-		},
 		onShow() {
 			uni.removeStorageSync('orderList');
 			uni.removeStorageSync('payType');
@@ -106,6 +97,13 @@
 				})
 				return sum;
 			},
+			// 主题颜色
+			publicColor() {
+				return this.$store.state.publicColor
+			},
+			statusHeight() {
+				return this.$store.state.statusHeight
+			}
 		},
 		methods: {
 			// 数量输入事件
@@ -250,7 +248,6 @@
 						} else {
 							uni.setStorageSync('payType',0);
 							uni.navigateTo({
-								// url:`/pagesA/getReadyDan/getReadyDan?isNei=${isNei}`
 								url:`/pagesA/getReadyDan/getReadyDan-two?isNei=${isNei}`
 							})
 						}

pagesA/suggestions/suggestions.vue

@@ -11,10 +11,10 @@
 					<view class="flexs mar-y20 titlel">问题类型</view>
 					<radio-group @change="changeCate" class="width100 disac">
 						<label class="radio disac">
-							<radio style="transform: scale(.7);" :value="2" checked color="#3875f6"/><text>改进意见/建议</text>
+							<radio style="transform: scale(.7);" :value="2" checked :color="publicColor"/><text>改进意见/建议</text>
 						</label>
 						<label class="radio disac">
-							<radio style="transform: scale(.7);" :value="1" color="#3875f6"/><text>投诉</text>
+							<radio style="transform: scale(.7);" :value="1" :color="publicColor"/><text>投诉</text>
 						</label>
 					</radio-group>
 					<!-- <radio-group @change="changeCate" class="width100 disac">

pagesB/articleDetail/articleDetail.vue

@@ -42,7 +42,7 @@
 				<view @tap="lianK" class="disac posir lianShare" style="background-color: #3875F6; border-top-left-radius: 51rpx;border-bottom-left-radius: 51rpx;">
 					<image src="/static/public/bottom-customer.png" class="mar-zy20" style="width: 47rpx;height: 47rpx;" mode="aspectFill"></image>
 					<view>联系客服</view>
-					<button class="fon24 posia" style="opacity: 0;top: 0;left: 0;right: 0;bottom: 0;" open-type="contact">客服</button>
+					<!-- <button class="fon24 posia" style="opacity: 0;top: 0;left: 0;right: 0;bottom: 0;" open-type="contact">客服</button> -->
 				</view>
 				<view class="disac posir lianShare" style="background-color: #38CE51;border-top-right-radius: 51rpx;border-bottom-right-radius: 51rpx;">
 					<image src="/static/public/bottom-shear.png" style="width: 47rpx;height: 47rpx;margin-left: 15rpx;margin-right: 8rpx;" mode="aspectFill"></image>
@@ -185,6 +185,11 @@
 				})
 			},
 			lianK(){//客服
+				wx.openCustomerServiceChat({
+					extInfo: {url: `https://work.weixin.qq.com/kfid/kfc0d895c27861955a2?enc_scene=${'ENC6yeVMve4yhC238GG9zc5VYa6WaddYNHvNriZ6KueYvXj'}&scene_param=${uni.getStorageSync('openid')}`},
+					corpId: 'ww62997b64e2c56170',
+					success(res) {}
+				})
 				this.$toolAll.tools.closeTimer()//清空埋点倒计时
 				this.$requst.post('user/record',{type:'other',action:'ask',id:0}).then(res=>{},error=>{})
 				// 调用tools.js中的种植埋点事件

pagesB/messagecenter/messagecenter.vue

@@ -3,8 +3,14 @@
 		<!-- 状态栏 -->
 		<status-nav :titleVal="'消息'" :whereCome="comeNum" :statusTitle="true"></status-nav>
 		<view id="daoh" class="bacf pad-zy30 pad-sx20 isTopf fon28 col3 disja" :style="{top:statusHeight+'px'}">
-			<view @tap="switchEv(true)" :class="isWen?'isWen bold':'col9'" class="posir">日程提醒</view>
+			<view @tap="switchEv(true)" :class="isWen?'bold':'col9'" class="posir" :style="{color: isWen?publicColor:''}">
-			<view @tap="switchEv(false)" :class="!isWen?'isWen bold':'col9'" class="posir">消息中心</view>
+				日程提醒
+				<view v-if="isWen" class="isWen":style="{background: publicColor}"></view>
+			</view>
+			<view @tap="switchEv(false)" :class="!isWen?'bold':'col9'" class="posir" :style="{color: !isWen?publicColor:''}">
+				消息中心
+				<view v-if="!isWen" class="isWen":style="{background: publicColor}"></view>
+			</view>
 		</view>
 		<!-- 列表 -->
 		<view :style="{paddingTop: (statusHeight+chuTop+15)+'px'}" class="pad-zy32">
@@ -54,7 +60,11 @@
 		computed:{
 			statusHeight() {
 				return this.$store.state.statusHeight
-			}
+			},
+			// 主题颜色
+			publicColor() {
+				return this.$store.state.publicColor
+			},
 		},
 		onPageScroll(e) {
 		    e.scrollTop > 360 ? this.showTop = true : this.showTop = false
@@ -183,7 +193,7 @@
 
 <style>
 	.isWen{color: #3875F6;}
-	.isWen::after{
+	.isWen{
 		content: '';
 		display: block;
 		height: 8rpx;

pagesB/myCollection/myCollection.vue

@@ -6,8 +6,14 @@
 		<!-- 列表 -->
 		<view>
 			<view id="daoh" class="bacf pad-zy30 pad-sx20 isTopf fon28 col3 disja" :style="{top:statusHeight+'px'}">
-				<view @tap="shopCollection(0)" :class="isWen?'isWen':''" class="posir">文章收藏</view>
+				<view @tap="shopCollection(0)" class="posir" :style="{color: isWen ? publicColor : ''}">
-				<view @tap="shopCollection(1)" :class="!isWen?'isWen':''" class="posir">商品收藏</view>
+					文章收藏
+					<view v-if="isWen" class="isWen" :style="{background: publicColor}"></view>
+				</view>
+				<view @tap="shopCollection(1)" class="posir" :style="{color: !isWen ? publicColor : ''}">
+					商品收藏
+					<view v-if="!isWen" class="isWen" :style="{background: publicColor}"></view>
+				</view>
 			</view>
 			<view :style="{paddingTop:(statusHeight+chuTop+15)+'px'}">
 				<view v-if="isWen">
@@ -412,7 +418,7 @@
 
 <style>
 	.isWen{color: #3875F6;}
-	.isWen::after{
+	.isWen{
 		content: '';
 		display: block;
 		height: 4rpx;

pagesB/shopDetail/shopDetail.vue

@@ -188,7 +188,9 @@
 			<!-- 购物车 -->
 			<view @tap="goShopCart" class="detail-cart-box">
 				<view class="posir">
-					<image src="/static/public/cart.png" mode="aspectFill"></image>
+					<view class="disjcac" style="width: 112rpx;height: 112rpx;border-radius: 100%" :style="{background:publicColor}">
+						<i class="icon icon-shop-cart colf" style="font-size: 60rpx;"></i>
+					</view>
 					<view class="posia" v-if="cartNum!=0"><view>{{cartNum}}</view></view>
 				</view>
 			</view>
@@ -196,7 +198,7 @@
 			<view @tap="lianK" class="shopKf">
 				<view class="posir">
 					<image src="/static/public/kf-logo.png" mode="aspectFill" style="width: 142rpx;height: 142rpx;"></image>
-					<button open-type="contact" class="posia-op"></button>
+					<!-- <button open-type="contact" class="posia-op"></button> -->
 				</view>
 			</view>
 			<!-- 立即购买，加入购物车弹框 -->
@@ -584,7 +586,6 @@
 					uni.setStorageSync('payType',this.detailObj.pay_type);
 				} else {uni.setStorageSync('payType','')}
 				uni.navigateTo({
-					// url:`/pagesA/getReadyDan/getReadyDan?isNei=${this.isNei}&isVirtual=${this.detailObj.spu_type}`
 					url:`/pagesA/getReadyDan/getReadyDan-two?isNei=${this.isNei}&isVirtual=${this.detailObj.spu_type}`
 				})
 			},
@@ -644,6 +645,11 @@
 				this.skuDetail = this.allRes.sku[index];
 			},
 			lianK(){//客服
+				wx.openCustomerServiceChat({
+					extInfo: {url: `https://work.weixin.qq.com/kfid/kfc0d895c27861955a2?enc_scene=${'ENC6yeVMve4yhC238GG9zc5VYa6WaddYNHvNriZ6KueYvXj'}&scene_param=${uni.getStorageSync('openid')}`},
+					corpId: 'ww62997b64e2c56170',
+					success(res) {}
+				})
 				this.$requst.post('user/rand-bind-service').then(res=>{})
 				this.$toolAll.tools.closeTimer()//清空埋点倒计时
 				this.$requst.post('user/record',{type:'other',action:'ask',id:0}).then(res=>{},error=>{})
@@ -943,4 +949,5 @@
 </script>
 
 <style>
+	@import url("@/commons/icon-font.css");
 </style>