提交

App.vue

@@ -7,7 +7,7 @@
 		globalData: {
 			// wsUrl: 'wss://websocket.cdwjyyh.com',
 			wsUrl: '',
-			appId: 'wx94951f52d3ac5e25',
+			appId: 'wx3fb7ca188c55e2e8',
 		},
 		onLoad: function (){
 			
@@ -113,14 +113,42 @@
 		},
 		 
 		methods: {
+			checkUpdates(){
+				const updateManager = uni.getUpdateManager();
+				uni.showModal({
+					title: '更新提示',
+					content: '新版本已经准备好，是否重启小程序？',
+					confirmText: '立即重启',
+					confirmColor: '#2179f5',
+					showCancel: false,
+					success(res) {
+						if (res.confirm) {
+							// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+							updateManager.applyUpdate();
+						}
+					}
+				});
+							
+				updateManager.onUpdateFailed(function() {
+					// 新的版本下载失败
+					uni.showModal({
+						title: '更新提示',
+						content: '新版本下载失败，请检查网络后重试。',
+						showCancel: false
+					});
+				});
+			},
 			checkUpdate() {
 				const updateManager = uni.getUpdateManager();
 				updateManager.onCheckForUpdate(function(res) {
 					// 请求完新版本信息的回调
 					console.log('是否有新版本：', res.hasUpdate);
 				});
-			
+				
 				updateManager.onUpdateReady(function() {
+					uni.removeStorageSync('userInfo')
+					uni.removeStorageSync('TOKEN_WEXIN')
+					uni.removeStorageSync('userinfos')
 					uni.showModal({
 						title: '更新提示',
 						content: '新版本已经准备好，是否重启小程序？',

api/common.js

@@ -27,9 +27,15 @@ let request = new Request().http
  	 return request('/app/common/getWeixinPrescribeTemps',null,'GET');
  }
  
- 
  export function getDictByKey(data) {
   	 return request('/app/common/getDictByKey',data,'GET');
  } 
- 
+ //用户协议
+ export function getuserAgreement(data) {
+  	 return request('/h5/userAgreement',data,'GET');
+ } 
+ //隐私保护
+ export function getprivacyPolicy(data) {
+  	 return request('/h5/privacyPolicy',data,'GET');
+ } 
  

api/coupon.js

@@ -29,5 +29,4 @@ let request = new Request().http
  //退款立减金
  export function refundCashCoupon(data) {
  	 return request('/app/coupon/applyCashCouponRefund',data,'POST','application/json;charset=UTF-8');
- }
- 
+ }

api/manageCompany.js

@@ -269,4 +269,25 @@ export function courseList(data){
 //获取appid配置
 export function getLoginMiniAppId({appId}){
 	return request('/companyapp/app/fs/course/getLoginMiniAppId/'+appId,{},'GET', 'application/json;charset=UTF-8');
-}
+}
+
+//语音接口
+ export function addVoicePrintUrl(data) {
+ 	 return request('/companyapp/app/companyUser/addVoicePrintUrl',data,'POST','application/json;charset=UTF-8');
+ }
+ //  模板语音上传接口
+ export function companyUserVoiceNew(data) {
+ 	 return request('/companyapp/app/companyUser/companyUserVoiceNew',data,'GET','application/json;charset=UTF-8');
+ }
+ // 模板语音上传接口
+ export function companyUserVoice(data) {
+ 	 return request('/companyapp/app/companyUser/companyUserVoice',data,'GET','application/json;charset=UTF-8');
+ }
+ // 获取语音列表
+ export function querySopVoiceList(data) {
+ 	 return request('/companyapp/app/companyUser/querySopVoiceList',data,'GET','application/json;charset=UTF-8');
+ }
+ // 获取语音详情
+ export function queryDetail(id) {
+ 	 return request('/companyapp/app/companyUser/query/'+id,null,'GET','application/json;charset=UTF-8');
+ }

api/payment.js

@@ -21,12 +21,24 @@ let request = new Request().http
  export function getPaymentDetail({paymentId}) {
  	 return request('/app/scan/payment/getPaymentDetail/'+paymentId,{},'GET','application/json;charset=UTF-8');
  }
- // 退款审核接口
- export function toReviewRefund(data) {
- 	 return request('/app/scan/payment/refund/audit',data,'PUT','application/json;charset=UTF-8');
+ // 发起申请退款接口（普通员工）
+ export function applyRefund(data) {
+ 	 return request('/app/scan/payment/applyRefund',data,'POST','application/json;charset=UTF-8');
  }
- // 退款接口
+ // 直接退款接口（管理员）
  export function refundStorePayment(data) {
  	 return request('/app/scan/payment/refundStorePayment',data,'POST','application/json;charset=UTF-8');
  }
- 
+ // 查询待审核退款申请列表（管理员）
+ export function getPendingRefundList(data) {
+ 	 return request('/app/scan/payment/getPendingRefundList',data,'GET','application/json;charset=UTF-8');
+ }
+ // 管理员审核退款（管理员）
+ export function auditRefund(data) {
+ 	 return request('/app/scan/payment/auditRefund',data,'POST','application/json;charset=UTF-8');
+ }
+ 
+ // 管理员审核退款总数（管理员）
+ export function getRefundAuditCount(data) {
+ 	 return request('/app/scan/payment/getRefundAuditCount',data,'GET','application/json;charset=UTF-8');
+ }

api/user.js

@@ -7,8 +7,8 @@ let request = new Request().http
  export function loginByMp(data) {
  	 return request('/app/wx/loginByMp',data,'POST','application/json;charset=UTF-8');
  }
- export function getUserInfo() {
- 	 return request('/app/user/getUserInfo',null,'GET');
+ export function getUserInfo(data) {
+ 	 return request('/app/user/getUserInfo',data,'GET','application/json;charset=UTF-8');
  }
  
  export function editUser(data) {

assets/css/common.less

@@ -183,8 +183,8 @@ radio .wx-radio-input{
 }
 /* 选中后的 背景样式  */
 radio .wx-radio-input.wx-radio-input-checked{
-	background: linear-gradient(135deg, #66b2ef  0%, #2BC7B9 100%);
-	border: 1px solid #2BC7B9;
+	background: linear-gradient(135deg, #ef9266  0%, #FC581C 100%);
+	border: 1px solid #FC581C;
 }
 /* 选中后的 对勾样式 （白色对勾） */
 radio .wx-radio-input.wx-radio-input-checked::before{
@@ -197,8 +197,8 @@ checkbox .wx-checkbox-input{
 	border-radius: 50%;
 }
 checkbox .wx-checkbox-input.wx-checkbox-input-checked {
-	background: linear-gradient(135deg, #66b2ef 0%, #2BC7B9 100%);
-	border: 1px solid #2BC7B9;
+	background: linear-gradient(135deg, #ef9266 0%, #FC581C 100%);
+	border: 1px solid #FC581C;
 	border-radius: 50%;
 }
 checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {

assets/css/common.scss

@@ -159,5 +159,5 @@ $steps: 100 200 300 400 500 600 700 800 bold;
 	background-color: #fff;
 }
 .base-color{
-	color: #018C39;
+	color: #FC581C;
 }

common/request.js

@@ -4,15 +4,8 @@ import {TOKEN_KEYAuto} from '@/utils/courseTool.js'
 export default class Request {
 	http(router, data = {}, method,contentType) {
 		let that = this;
-		//let path = 'http://localhost:7014';
-		// let path = 'https://test.userapp.store.cdwjyyh.com';
-		// let path = 'https://user.test.ylrztop.com/api';
-		// let path = 'https://userapp.zkhj6.com'//中康
-		// let path = 'http://e6dde68c.natappfree.cc/store'//本地接口
+		// let path = 'http://be4d268b.natappfree.cc/store'//本地接口
 		let path = 'https://userapp.moonxiang.com/store'//北京存在文化商城
-		// let path = 'http://pa87de27.natappfree.cc/store'//本地（测试）
-		
-		// let path = 'https://user.test.ylrztop.com/prod-api/store'//云联融智优选
 		let type = 0
 		uni.setStorageSync('requestPath',path)
 		// uni.showLoading({
@@ -30,7 +23,7 @@ export default class Request {
 		if(router.indexOf("/course_auto")!=-1){
 			type = 2
 			router =router.replace('/course_auto','')
-			// path = 'https://userapp.gjh2024.com/apis'//金康键
+			// path = 'http://a2795e37.natappfree.cc'//金康键
 			// path = 'https://userapp.moonxiang.com/prod-api'//青岛市德瑞康
 			path = 'https://userapp.moonxiang.com'//存在
 			// path = 'https://user.test.ylrztop.com/prod-api'//云联融智优选
@@ -59,7 +52,7 @@ export default class Request {
 				header: {
 					// 'Content-Type': 'application/x-www-form-urlencoded',
 					'Content-Type': httpContentType,
-					'AppToken': token
+					'AppToken': token,
 				},
 				url: `${path}${router}`,
 				data: data,
@@ -76,6 +69,12 @@ export default class Request {
 						if(type==2) {
 							uni.removeStorageSync(TOKEN_KEYAuto)
 						}
+						if(type==1) {
+							uni.removeStorageSync('ManageToken');
+							uni.navigateTo({
+								url:'/pages_manage/login'
+							})
+						}
 						resolve({ code: 401, data: null });
 						return
 					}

components/Menu.vue

@@ -139,7 +139,7 @@ export default {
 		.dot-active {
 			width: 40rpx;
 			height: 3rpx;
-			background: #2BC7B9;
+			background: #FC581C;
 			margin-right: 10rpx;
 		}
 	}

components/chengpeng-audio/free-audio.vue

@@ -15,7 +15,7 @@
 				:step='0.1'
 				backgroundColor="#E9F0F0"
 				:block-size='14'
-				block-color='#2BC7B9'>
+				block-color='#FC581C'>
 			</slider>
 		</view>
 		<view class='ml-3'>{{getTime(Math.round(currentTime))}}</view>

components/chengpeng-audio/redme.md

@@ -9,7 +9,7 @@
 ```javascript
 //html
 <template>
-  <free-audio startPic='https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/icon/play.png' endPic='https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/icon/stop.png' :audioId='audio1' :url='path'></free-audio>
+  <free-audio startPic='https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/icon/play.png' endPic='https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/icon/stop.png' :audioId='audio1' :url='path'></free-audio>
 </template>
 
 //js

components/evan-switch/evan-switch.vue

@@ -112,7 +112,7 @@
 		transition: background-color 0.3s;
 		width: 100upx;
 		height: 36upx;
-		background: #2BC7B9;
+		background: #FC581C;
 		border-radius: 18upx;
 		/* #ifndef APP-NVUE */
 		box-sizing: content-box;

components/im/tui-chat/message-elements/audio-message/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view :class="'audio-message ' + (isMine ? 'my-audio' : '')">
-		<image class="audio-icon" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/audio.png"></image>
+		<image class="audio-icon" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/audio.png"></image>
 		<view class="audio " @click="handlePlayAudioMessage" :style="'width: ' + 120 + 'rpx'">{{ '" ' + message.payload.second }}</view>
 	</view>
 </template>

components/im/tui-chat/message-elements/custom-message/index.vue

@@ -19,7 +19,7 @@
 			<view class="custom-content">
 				<view class="custom-content-title">{{ renderDom[0].title }}</view>
 				<view class="custom-content-score">
-					<image v-for="(item, index) in renderDom[0].score" :key="index" class="score-star" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/star.png"></image>
+					<image v-for="(item, index) in renderDom[0].score" :key="index" class="score-star" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/star.png"></image>
 				</view>
 				<view class="custom-content-description">{{ renderDom[0].description }}</view>
 			</view>

components/im/tui-chat/message-elements/file-message/index.vue

@@ -3,7 +3,7 @@
 		<view class="TUI-fileMessage">
 			<view class="fileMessage">
 				<view class="fileMessage-box">
-					<image class="file-icon" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/file.png"></image>
+					<image class="file-icon" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/file.png"></image>
 					<label @tap="download" class="file-title">{{ filePayload.fileName }}</label>
 				</view>
 			</view>

components/im/tui-chat/message-elements/video-message/index.vue

@@ -1,11 +1,11 @@
 <template>
 	<view :class="'video-box ' + (isMine ? 'my-video' : '')" @click="playerHander">
-		<image class="video-icon" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/video-play.png"></image>
+		<image class="video-icon" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/video-play.png"></image>
 	</view>
 </template>
 
 <script>
-import videoIcon from 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/video-play.png';
+import videoIcon from 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/video-play.png';
 export default {
 	data() {
 		return {

components/im/tui-chat/message-input/index.css

@@ -29,7 +29,7 @@
 	height: 48rpx;
 	margin-left: 16rpx;
 	border-radius: 24rpx;
-	background-color: #2BC7B9;
+	background-color: #FC581C;
 }
 
 .TUI-commom-function-item:first-child {

components/im/tui-chat/message-private/service-evaluation/index.vue

@@ -12,7 +12,7 @@
 						:key="index"
 						class="score-star"
 						:data-score="item"
-						:src="'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/star' + (item > score ? '-grey' : '') + '.png'"
+						:src="'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/star' + (item > score ? '-grey' : '') + '.png'"
 						@tap="handleScore"
 					></image>
 				</view>

components/likeProduct.vue

@@ -1,7 +1,7 @@
 <template>
    <view>
 		<view class="like-title" v-show="list &&list.length > 0">
-			<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/like.png" mode=""></image>
+			<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/like.png" mode=""></image>
 			<text class="text">猜你喜欢</text>
 		</view>
 		<view class="like-list">
@@ -64,7 +64,10 @@
 	},
 	methods: {
 		getUserInfos(){
-			getUserInfo().then(res => {
+			const data={
+				appId:wx.getAccountInfoSync().miniProgram.appId,
+			}
+			getUserInfo(data).then(res => {
 					if(res.code==200){
 						if(res.user!=null){
 							// if(res.user.isPromoter==null||res.user.isPromoter==0){

components/px-popup-bottom/px-popup-bottom.vue

@@ -24,7 +24,7 @@
 </template>
 
 <script>
-	// import iconClose from 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/close40.png'
+	// import iconClose from 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/close40.png'
 	export default {
 		props: {
 			title: { //标题
@@ -82,7 +82,7 @@
 				isAnimaStart: false,
 				rpxRate: "",
 				cotRadius: 0,
-				closeIcon:'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/close40.png'
+				closeIcon:'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/close40.png'
 			}
 		},
 		watch: {

components/tabbar/tabbar.vue

@@ -71,36 +71,36 @@
 			},
 			themeicon() {
 				this.tabbarList = [{
-						iconPath: "https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/home.png",
-						selectedIconPath: "https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/home_sel.png",
+						iconPath: "https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/home.png",
+						selectedIconPath: "https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/home_sel.png",
 						Text: '首页',
 						url: '/pages/home/index',
 						isshowed:true
 					},
 					{
-						iconPath: "https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/health.png",
-						selectedIconPath: "https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/health_sel.png",
+						iconPath: "https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/health.png",
+						selectedIconPath: "https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/health_sel.png",
 						Text: '健康百科',
 						url: '/pages/healthy/index',
 						isshowed:true
 					},
 					{
-						iconPath: "https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/archive.png",
-						selectedIconPath: "https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/archive_sel.png",
+						iconPath: "https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/archive.png",
+						selectedIconPath: "https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/archive_sel.png",
 						Text: '健康档案',
 						url: '/pages/healthy/idea',
 						isshowed:false
 					},
 					{
-						iconPath: "https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/shop_mall.png",
-						selectedIconPath: "https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/shop_mall_sel.png",
+						iconPath: "https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/shop_mall.png",
+						selectedIconPath: "https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/shop_mall_sel.png",
 						Text: '健康产品',
 						url: '/pages/shopping/index',
 						isshowed:false
 					},
 					{
-						iconPath: "https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/my.png",
-						selectedIconPath: "https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/my_sel.png",
+						iconPath: "https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/my.png",
+						selectedIconPath: "https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/my_sel.png",
 						Text: '我的',
 						url: '/pages/user/index',
 						isshowed:true
@@ -137,7 +137,7 @@
 		color: #626468;
 	}
 	.actcolor{
-		color: #2BC7B9;
+		color: #FC581C;
 	}
 	.tabbar-list{
 		display: flex;

components/tuiProduct.vue

@@ -1,7 +1,7 @@
 <template>
    <view>
 		<!-- <view class="like-title">
-			<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/tui.png" mode=""></image>
+			<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/tui.png" mode=""></image>
 			<text class="text">精选商品</text>
 		</view> -->
 		<view class="like-list">
@@ -64,7 +64,10 @@
 	},
 	methods: {
 		getUserInfos(){
-			getUserInfo().then(res => {
+			const data={
+				appId:wx.getAccountInfoSync().miniProgram.appId,
+			}
+			getUserInfo(data).then(res => {
 					if(res.code==200){
 						if(res.user!=null){
 							// if(res.user.isPromoter==null||res.user.isPromoter==0){

components/yk-screenRecord/yk-screenRecord.vue

@@ -0,0 +1,163 @@
+<template>
+	<view class="zzc_mol" v-if="isRecording"></view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				isRecording: false
+			}
+		},
+		created() {
+			this.screenInit();
+		},
+		onUnload() {
+			this.AllowScreenshots()
+		},
+		beforeDestroy() {
+			this.AllowScreenshots()
+		},
+		methods: {
+			screenInit() {
+				let _this = this;
+				// #ifdef H5
+				uni.showToast({
+					title: '请在APP或者小程序环境下操作',
+					icon: 'error'
+				})
+				// #endif
+				// #ifndef H5
+				uni.getSystemInfo({
+					success: function(e) {
+						// #ifdef APP-PLUS
+						if (e.platform == 'android') {
+							//注意：一旦开启禁止截屏/录屏后将会全局生效，关闭页面时记得放开允许截屏/录屏
+							_this.NoscreenCapture();
+						} else {
+							//在APP IOS端截屏、录屏暂时没办法实现，可以寻求原生解决
+						}
+						// #endif
+
+						// #ifdef MP-WEIXIN
+						if (e.platform == 'android') {
+							//微信小程序在安卓手机上 禁止截屏/录屏(注意：禁止后录屏动作还是会进行，但录屏后的视频是黑屏的)
+							wx.setVisualEffectOnCapture({
+								visualEffect: 'hidden', //传入 hidden 则表示在截屏/录屏时隐藏屏幕
+								success: (res) => {
+									console.log(res)
+								},
+								fail: (err) => {
+									console.log(err)
+								},
+								complete: (res) => {
+									console.log(res)
+								}
+							})
+						} else {
+							//微信小程序在IOS手机上，注意：目前微信小程序在ios上也只能通过监听录屏状态，然后通过添加view层来进行阻止，截屏暂时无法实现
+							//监听用户录屏事件
+							wx.onScreenRecordingStateChanged(function(res) {
+								if (res.state == 'start') {
+									_this.isRecording = true
+								} else {
+									_this.isRecording = false
+								}
+							})
+							//查询用户是否在录屏
+							wx.getScreenRecordingState({
+								success: (res) => {
+									if (res.state == 'on') {
+										_this.isRecording = true
+									} else if (res.state == 'off') {
+										_this.isRecording = false
+									}
+								},
+								fail: (err) => {
+									_this.isRecording = false
+								}
+							})
+						}
+						// #endif
+					}
+				})
+				// #endif
+			},
+			//安卓端禁止截屏
+			NoscreenCapture() {
+				let osname = plus.os.name;
+				if (osname == "Android") {
+					var activity = plus.android.runtimeMainActivity();
+					plus.android.invoke(plus.android.invoke(activity, "getWindow"), "addFlags", 0x00002000);
+				}
+			},
+			//安卓端允许截屏  
+			AllowScreenshots() {
+				let _this = this;
+				uni.getSystemInfo({
+					success: function(e) {
+						// #ifdef MP-WEIXIN
+						if (e.platform == 'android') {
+							//微信小程序在安卓手机上 禁止截屏/录屏(注意：禁止后录屏动作还是会进行，但录屏后的视频是黑屏的)
+							wx.setVisualEffectOnCapture({
+								visualEffect: 'none', //传入 hidden 则表示在截屏/录屏时隐藏屏幕
+								success: (res) => {
+									console.log(res)
+								},
+								fail: (err) => {
+									console.log(err)
+								},
+								complete: (res) => {
+									console.log(res)
+								}
+							})
+						} else {
+							//微信小程序在IOS手机上，注意：目前微信小程序在ios上也只能通过监听录屏状态，然后通过添加view层来进行阻止，截屏暂时无法实现
+							//监听用户录屏事件
+							wx.onScreenRecordingStateChanged(function(res) {
+								if (res.state == 'start') {
+									_this.isRecording = false
+								} else {
+									_this.isRecording = false
+								}
+							})
+							//查询用户是否在录屏
+							wx.getScreenRecordingState({
+								success: (res) => {
+									if (res.state == 'on') {
+										_this.isRecording = false
+									} else if (res.state == 'off') {
+										_this.isRecording = false
+									}
+								},
+								fail: (err) => {
+									_this.isRecording = false
+								}
+							})
+						}
+						// #endif
+					}
+				})
+				// #ifdef APP-PLUS
+				let osname = plus.os.name;
+				if (osname == "Android") {
+					var activity = plus.android.runtimeMainActivity();
+					plus.android.invoke(plus.android.invoke(activity, "getWindow"), "clearFlags", 0x00002000);
+				}
+				// #endif
+			}
+		}
+	}
+</script>
+
+<style>
+	.zzc_mol {
+		background: #000;
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		z-index: 99999;
+		top: 0;
+		left: 0;
+	}
+</style>

manifest.json

@@ -1,7 +1,7 @@
 {
-    "name" : "存在文化商城小程序",
+    "name" : "新食养元气商城小程序",
     "appid" : "__UNI__A8490FA",
-    "description" : "存在文化商城小程序",
+    "description" : "新食养元气商城小程序",
     "versionName" : "1.0.0",
     "versionCode" : "100",
     "transformPx" : false,
@@ -52,7 +52,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx94951f52d3ac5e25",
+        "appid" : "wx32467b1d3db7e085",
         "setting" : {
             "urlCheck" : false
         },

pages.json

@@ -24,7 +24,7 @@
 		{
 			"path": "pages/home/index",
 			"style": {
-				"navigationBarTitleText": "食养生活",
+				"navigationBarTitleText": "红蚂蚁一",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom",
 				"app-plus": {
@@ -1048,6 +1048,15 @@
 							"titleNView": false
 						}
 					}
+				},
+				{
+					"path": "refundList",
+					"style": {
+						"navigationBarTitleText": "退款申请",
+						"app-plus": {
+							"titleNView": false
+						}
+					}
 				}
 			]
 		},
@@ -1222,6 +1231,42 @@
 						"navigationBarTitleText": "更换会员归属",
 						"enablePullDownRefresh": false
 					}
+				},
+				{
+					"path": "voice",
+					"style": {
+						"navigationBarTitleText": "声音采集",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#ffffff",
+						"navigationBarTextStyle": "black",
+						"app-plus": {
+							"bounce": "none" // 页面回弹
+						}
+					}
+				},{
+					"path" : "voiceItem",
+					"style" : 
+					{
+						"navigationBarTitleText" : "声音录制",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor":"#ffffff",
+						"navigationBarTextStyle":"black",
+						"app-plus": {
+							"bounce": "none" // 页面回弹
+						}
+					}
+				},{
+					"path" : "voiceList",
+					"style" : 
+					{
+						"navigationBarTitleText" : "声音录制",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor":"#ffffff",
+						"navigationBarTextStyle":"black",
+						"app-plus": {
+							"bounce": "none" // 页面回弹
+						}
+					}
 				}
 			]
 		},
@@ -1258,8 +1303,14 @@
 				{
 					"path": "videovip",
 					"style": {
-						"navigationBarTitleText": "看课详情",
-						"enablePullDownRefresh": false
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom",
+						"scrollIndicator": "none",
+						"app-plus": {
+							"bounce": "none",
+							"softinputMode": "adjustResize"
+						}
 					}
 				},
 				{
@@ -1282,7 +1333,12 @@
 					"style": {
 						"navigationBarTitleText": "",
 						"enablePullDownRefresh": false,
-						"navigationStyle": "custom"
+						"navigationStyle": "custom",
+						"scrollIndicator": "none",
+						"app-plus": {
+							"bounce": "none",
+							"softinputMode": "adjustResize"
+						}
 					}
 				}
 			]
@@ -1290,13 +1346,13 @@
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "食养生活",
+		"navigationBarTitleText": "红蚂蚁一",
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#FFFFFF"
 	},
 	"tabBar": {
 		"color": "#666666",
-		"selectedColor": "#3BA737",
+		"selectedColor": "#FC581C",
 		// "custom": true, 
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
@@ -1306,20 +1362,20 @@
 		"spacing": "4px",
 		"list": [{
 				"pagePath": "pages/home/index",
-				"iconPath": "/static/tabbar/home.png",
-				"selectedIconPath": "/static/tabbar/home_sel.png",
+				"iconPath": "/static/orangetabbar/home.png",
+				"selectedIconPath": "/static/orangetabbar/home_sel.png",
 				"text": "首页"
 			},
 			{
 				"pagePath": "pages/healthy/index",
-				"iconPath": "/static/tabbar/health.png",
-				"selectedIconPath": "/static/tabbar/health_sel.png",
+				"iconPath": "/static/orangetabbar/health.png",
+				"selectedIconPath": "/static/orangetabbar/health_sel.png",
 				"text": "食养百科"
 			},
 			{
 				"pagePath": "pages/shopping/index",
-				"iconPath": "/static/tabbar/shop_mall.png",
-				"selectedIconPath": "/static/tabbar/shop_mall_sel.png",
+				"iconPath": "/static/orangetabbar/shop_mall.png",
+				"selectedIconPath": "/static/orangetabbar/shop_mall_sel.png",
 				"text": "产品"
 			},
 			// {
@@ -1330,8 +1386,8 @@
 			// },
 			{
 				"pagePath": "pages/user/index",
-				"iconPath": "/static/tabbar/my.png",
-				"selectedIconPath": "/static/tabbar/my_sel.png",
+				"iconPath": "/static/orangetabbar/my.png",
+				"selectedIconPath": "/static/orangetabbar/my_sel.png",
 				"text": "我的"
 			}
 		]

pages/auth/login.vue

@@ -5,9 +5,9 @@
       <view class="force-login__content y-f">
 		  <view class="logo">
 		  	<view class="logo-img">
-		  		<image  src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logoshare.png"></image>
+		  		<image  src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logoshare.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> -->
@@ -27,8 +27,8 @@
 		 <view class="tips">
 			 <checkbox  :checked="isAgreement" @click="handleAgreement()" />
 			 <view  @click="handleAgreement()">您同意并接受</view>
-		 	<view class="btn"  @click="openH5('/h5/userAgreement')">《用户协议》</view>
-		 	<view class="btn" @click="openH5('/h5/privacyPolicy')">《隐私保护》</view>
+		 	<view class="btn"  @click="openH5(1)">《用户协议》</view>
+		 	<view class="btn" @click="openH5(2)">《隐私保护》</view>
 		 </view>
       </view>
     </view>
@@ -122,10 +122,10 @@ export default {
 			this.isAgreement=!this.isAgreement;
 		},
 		openH5(url){
-			var requestPath = uni.getStorageSync('requestPath');
-			uni.setStorageSync('url',requestPath+url);
+			// var requestPath = uni.getStorageSync('requestPath');
+			// uni.setStorageSync('url',requestPath+url);
 			uni.navigateTo({
-				url: '../home/h5'
+				url: '/pages/home/h5?val='+url
 			})
 		},
 		getCode(){
@@ -256,8 +256,8 @@ export default {
 			position: absolute;
 			width: 630rpx;
 			height: 80rpx;
-			background: linear-gradient(to right, #2BC7B9 0%, #2aa7B9 100%);
-			background: -moz-linear-gradient(to right, #2BC7B9 0%, #2aa7B9 100%);
+			background: linear-gradient(to right, #FC581C 0%, #2aa7B9 100%);
+			background: -moz-linear-gradient(to right, #FC581C 0%, #2aa7B9 100%);
 			// box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
 			border-radius: 40rpx;
 			font-size: 30rpx;
@@ -347,8 +347,8 @@ export default {
     .author-btn {
       width: 630rpx;
       height: 80rpx;
-      background: linear-gradient(to right, #66b2ef  0%, #2BC7B9 100%);
-      background: -moz-linear-gradient(to right, #66b2ef 0%, #2BC7B9 100%);
+      background: linear-gradient(to right, #ef9266  0%, #FC581C 100%);
+      background: -moz-linear-gradient(to right, #ef9266 0%, #FC581C 100%);
       // box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
       border-radius: 40rpx;
       font-size: 30rpx;
@@ -362,12 +362,12 @@ export default {
       height: 80rpx;
       margin-top: 30rpx;
       border-radius: 40rpx;
-      border: 2rpx solid #2BC7B9;
+      border: 2rpx solid #FC581C;
       background: none;
       font-size: 30rpx;
       font-family: PingFang SC;
       font-weight: 500;
-      color: #2BC7B9;
+      color: #FC581C;
     }
   }
 }
@@ -381,7 +381,7 @@ export default {
 	checkbox{
 	}
 	.btn{
-		color: #2BC7B9;
+		color: #FC581C;
 	}
 }
 
@@ -430,7 +430,7 @@ export default {
 				width: 50%;
 				height: 80rpx;
 				border-radius: 5rpx;
-				background-color: #2BC7B9;
+				background-color: #FC581C;
 				font-size: 30rpx;
 				font-family: PingFang SC;
 				font-weight: 500;
@@ -442,12 +442,12 @@ export default {
 				width: 50%;
 				height: 80rpx;
 				border-radius: 5rpx;
-				border: 2rpx solid #2BC7B9;
+				border: 2rpx solid #FC581C;
 				background: none;
 				font-size: 30rpx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #2BC7B9;
+				color: #FC581C;
 			}
 		}
 	}

pages/common/launch.vue

@@ -3,9 +3,9 @@
 		<view class="loadding" v-if="loadding==true">
 			<view class="circlebox">
 				<view class="circle"></view>
-				<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logo.png"></image>
+				<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logo.png"></image>
 			</view>
-			<text class="text">食养生活</text>
+			<text class="text">红蚂蚁一</text>
 		</view>
 	</view>
 </template>

pages/healthy/detail.vue

@@ -19,14 +19,14 @@
 				<view class="peop-box" @click="showUsers">
 					<view class="head-box">
 						<view class="head" v-for="(subitem,j) in views" :key="j">
-							<image :src="subitem.avatar==null?'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/detault_head.png':subitem.avatar" mode=""></image>
+							<image :src="subitem.avatar==null?'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/detault_head.png':subitem.avatar" mode=""></image>
 						</view>
 					</view>
-					<image class="arrow" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/arrow_gray.png" mode=""></image>
+					<image class="arrow" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/arrow_gray.png" mode=""></image>
 				</view>
 			</view>
 			<!-- <view class="share-btn">
-				<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/share.png" mode=""></image>
+				<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/share.png" mode=""></image>
 				<text>分享</text>
 				<button  class="share" data-name="shareBtn" open-type="share">分享</button>
 			</view> -->
@@ -34,7 +34,7 @@
 		<!-- 咨询按钮 -->
 		<view class="inquiry">
 			<view class="content">
-				<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/consult.png" mode=""></image>
+				<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/consult.png" mode=""></image>
 				<text class="text">咨询</text>
 				<button class="contact-btn" open-type="contact"></button>
 			</view>
@@ -232,7 +232,7 @@
 			font-family: PingFang SC;
 			font-weight: 500;
 			color: #FFFFFF;
-			background: #2BC7B9;
+			background: #FC581C;
 			border-radius: 40upx;
 			display: flex;
 			align-items: center;
@@ -277,7 +277,7 @@
 				font-size: 22upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #2BC7B9;
+				color: #FC581C;
 				line-height: 1;
 			}
 			 

pages/healthy/idea.vue

@@ -21,7 +21,7 @@
 				<view class="period">备注 {{item.remark!=null?item.remark:''}}</view>
 			</view>
 			<view v-if="docs.length == 0" class="no-data-box" @click="getMyDocList()">
-				<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/no_data.png" mode="aspectFit"></image>
+				<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/no_data.png" mode="aspectFit"></image>
 				<view class="empty-title">暂无数据</view>
 			</view>
 		</view>
@@ -230,7 +230,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #2BC7B9;
+				background: #FC581C;
 				border-radius: 44upx;
 			}
 		}

pages/healthy/index.vue

@@ -7,7 +7,7 @@
 			<!-- 搜索框 -->
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/search.png" mode=""></image>
 					<input type="text" v-model="searchValue" placeholder="输入关键字搜索" confirm-type="search" @confirm="doSearch" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 			</view>
@@ -32,11 +32,11 @@
 							<view class="readers">
 								<view class="head-box" v-if="item.viewsList!=null&&item.viewsList.length>0">
 									<view class="head" v-for="(subitem,j) in item.viewsList" :key="j" v-if="subitem!=null">
-										<image  :src="subitem.avatar==null?'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/detault_head.png':subitem.avatar" mode=""></image>
+										<image  :src="subitem.avatar==null?'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/detault_head.png':subitem.avatar" mode=""></image>
 									</view>
 								</view>
 								<view class="readings">
-									<image class="eye" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/eye.png" ></image>
+									<image class="eye" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/eye.png" ></image>
 									<text class="num">{{item.views}}</text>
 								</view>
 							</view>
@@ -80,7 +80,7 @@
 					},
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					empty: {
-						icon:'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/no_data.png',
+						icon:'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/no_data.png',
 						tip: '暂无数据'
 					},
 					textNoMore:'已经到底了'
@@ -246,15 +246,15 @@
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #3BA737;
-			background: #F5FFFE;
-			border: 1px solid #3BA737;
+			color: #FC581C;
+			background: #fff9f5;
+			border: 1px solid #FC581C;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #3BA737;
-				border: 1px solid #3BA737;
+				background: #FC581C;
+				border: 1px solid #FC581C;
 			}
 		}
 	}

pages/healthy/readUsers.vue

@@ -4,7 +4,7 @@
 		<view class="user-list">
 			<view class="item" v-for="(item,index) in dataList" :key="index">
 				<view class="img-box">
-					<image :src="item.avatar==null?'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/detault_head.png':item.avatar" mode=""></image>
+					<image :src="item.avatar==null?'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/detault_head.png':item.avatar" mode=""></image>
 				</view>
 				<text class="name">{{item.nickname}}</text>
 			</view>
@@ -32,7 +32,7 @@
 					},
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					empty: {
-						icon:'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/no_data.png',
+						icon:'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/no_data.png',
 						tip: '暂无数据'
 					}
 				},

pages/home/components/HotProduct.vue

@@ -2,7 +2,7 @@
     <view class="group-goods" v-if="detail.length>0">
         <view class="title-box x-bc"  >
 			<view class="justify-start align-center">
-				<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/hot_list.png" class="w40 h40"></image>
+				<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/hot_list.png" class="w40 h40"></image>
 				<text class="title"><text style="color:#FE4644">热门</text>榜单</text>
 			</view>
             <view class="group-people x-f" @tap="navTo('/pages/home/productList')">

pages/home/doctorCase.vue

@@ -4,7 +4,7 @@
 			<!-- 搜索框 -->
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/search.png" mode=""></image>
 					<input type="text"  v-model="searchVal" placeholder="输入关键字搜索"  confirm-type="搜索" @confirm="goSearch" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 			</view>
@@ -19,7 +19,7 @@
 					>
 						<view class="text">
 							{{ item.departmentName }}
-							<image v-show="deptId == item.departmentId" class="tab-bg" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/tab_bg.png" mode=""></image>
+							<image v-show="deptId == item.departmentId" class="tab-bg" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/tab_bg.png" mode=""></image>
 						</view>
 					</view>
 				</view>
@@ -44,9 +44,9 @@
 						</view>
 						<view class="name">{{item.doctorName}}</view>
 						<view class="line"></view>
-						<view class="posit">
+						<!-- <view class="posit">
 							{{utils.getDictLabelName("doctorPosition",item.doctorPosition)}}
-						</view>
+						</view> -->
 						<view class="line"></view>
 						<view class="address">{{item.hospitalName}}</view>
 					</view>
@@ -56,16 +56,16 @@
 						<!-- 语音回答 -->
 						<view class="voice-inner" v-if="item.orderType == '2'">
 							<free-audio 
-								startPic='https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/play.png' 
-								endPic='https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/pause.png'
-								activeColor="#2BC7B9"
+								startPic='https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/play.png' 
+								endPic='https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/pause.png'
+								activeColor="#FC581C"
 								:audioId="'audio'+index"
 								:url='item.replyAudioUrl'
 							></free-audio>
 						</view>
 					</view>
 					<view class="read-box">
-						<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/eye.png" mode=""></image>
+						<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/eye.png" mode=""></image>
 						<text class="text">{{item.views}}人看过</text>
 					</view>
 				</view>
@@ -101,7 +101,7 @@
 					},
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					empty: {
-						icon:'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/no_data.png',
+						icon:'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/no_data.png',
 						tip: '暂无数据'
 					}
 				},

pages/home/h5.vue

@@ -1,22 +1,58 @@
 <template>
 	<view class="content">
-		 <web-view :src="webUrl"></web-view>
+		 <view v-html="webUrl" style="padding-top: 20rpx;"></view>
 	</view>
 </template>
 
 <script>
- 
+ import {getuserAgreement,getprivacyPolicy} from '@/api/common.js'
  export default {
  	data() {
  		return {
 			webUrl:"",
  		}
  	},
-	onLoad(val) {
-		this.webUrl=uni.getStorageSync('url');
-		console.log(this.webUrl)
-	}
- 	 
+	onLoad(option) {
+		// this.webUrl=uni.getStorageSync('url');
+		if(option.val==1){
+			uni.setNavigationBarTitle({
+				title: "用户协议"
+			  });
+			this.getuserAgreements()
+		}else{
+			uni.setNavigationBarTitle({
+				title: "隐私保护"
+			  });
+			this.getprivacyPolicys()
+		}
+		console.log(option)
+	},
+ 	 methods:{
+		 getuserAgreements(){
+			 getuserAgreement().then(res=>{
+				 if(res.code==200){
+					 this.webUrl=res.userAgreement
+				 }else{
+					 uni.showToast({
+						icon:'none',
+						title: res.msg,
+					 });
+				 }
+			 })
+		 },
+		 getprivacyPolicys(){
+			 getprivacyPolicy().then(res=>{
+				 if(res.code==200){
+					 this.webUrl=res.privacyPolicy
+				 }else{
+					 uni.showToast({
+					 	icon:'none',
+					 	title: res.msg,
+					 });
+				 }
+			 })
+		 }
+	 }
  }
  
  
@@ -24,16 +60,9 @@
 
 
 <style scoped lang="scss">
-page{
-	height: 100%;
-}
 .content{
-	width: 100%;
-	height: 100%;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	
+	padding: 20rpx;
+	padding-bottom: 60rpx;
 }
  
 

pages/home/index.vue

@@ -1,24 +1,24 @@
 <template>
 	<view class="content">
 		<!-- 背景图片 -->
-		<image class="bg" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/hp_top_bg.png" mode=""></image>
+		<image class="bg" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/hp_top_bg.png" mode=""></image>
 		<view>
 			<view class="top-inner">
 				<view class="fixed-top-box" :style="{ background: bgColor }">
 					<!-- 这里是状态栏 -->
 					<view class="status_bar" :style="{height: statusBarHeight}"></view>
 					<view class="top-title">
-						<view class="name centerV">
-							<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/name.png" style="width: 256rpx;" mode="widthFix"></image>
-						</view>
-						<!-- <view class="name">食养生活</view> -->
+						<!-- <view class="name centerV">
+							<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/name.png" style="width: 256rpx;" mode="widthFix"></image>
+						</view> -->
+						<view class="name">红蚂蚁一</view>
 						<!-- <view class="dot">•</view><view class="sub-name">七彩互联网医院</view> -->
 					</view>
 					<!-- 搜索框、购物车、客服 -->
 					<view class="func-cont">
 						<view class="search-cont" :style="{width:userinfoa.isShow==0 || isuser==true?'633rpx':''}">
 							<image class="icon-search"
-								src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/search.png" mode="">
+								src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/search.png" mode="">
 							</image>
 							<input type="text" value="" placeholder="请输入产品名称"
 								placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;"
@@ -28,12 +28,12 @@
 						<uni-badge size="small" :text="cartCount" absolute="rightTop" type="error"
 							v-show="userinfoa.isShow==1&&isuser==false">
 							<view class="img-item" @click="goAuthUrl('../shopping/cart')">
-								<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/cart_wihte.png"
+								<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/cart_wihte.png"
 									mode=""></image>
 							</view>
 						</uni-badge>
 						<view class="img-item" style="position: relative;">
-							<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/customer.png" mode="">
+							<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/customer.png" mode="">
 							</image>
 							<button class="contact-btn" open-type="contact"></button>
 						</view>
@@ -65,24 +65,24 @@
 			</view>
 
 		</view>
-		<view class="open-class bgf radius12">
+		<!-- <view class="open-class bgf radius12">
 			<view class="title-box">
 				<text class="title">健康大讲堂</text>
 				<view class="more" @click="goClassList(1)">
 					<text>查看全部</text>
-					<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/toright.png"></image>
+					<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/toright.png"></image>
 				</view>
 			</view>
 			<view class="justify-start">
 				<view class="class-item" @click="goClass(item.courseId,1)" v-for="(item, index) in classList"
 					:key="index">
 					<view class="img-box">
-						<image :src="item.imgUrl || 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/no-img.png'" mode="aspectFill" ></image>
+						<image :src="item.imgUrl || 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/no-img.png'" mode="aspectFill" ></image>
 					</view>
 					<view>{{item.courseName}}</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="modules">
 			<view class="module">
 				<!--养生有道-->
@@ -101,7 +101,7 @@
 						<view class="title">养生讲堂</view>
 						<view class="more"  @click="navTo('/pages_index/index/doctorArticleList')" >
 							<view class="text">更多</view>
-							<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/arrow_gray.png"></image>
+							<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/arrow_gray.png"></image>
 						</view>
 					</view>
 					<scroll-view :scroll-x="true" style="white-space: nowrap;">
@@ -134,7 +134,7 @@
 			    		<view class="title">养生干货</view>
 			    		<view class="more" @click="navTo('/pages_index/index/articleList')">
 			    			<view class="text">更多</view>
-			    			<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/arrow_gray.png"></image>
+			    			<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/arrow_gray.png"></image>
 			    		</view>
 			    	</view>
 			    	<view class="article-box" v-if="articles.length>0">
@@ -168,7 +168,7 @@
 					<text class="left">健康百科</text>
 					<view class="right" @click="switchTo('../healthy/index')">
 						<text class="text">更多</text>
-						<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/arrow_gray.png" mode=""></image>
+						<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/arrow_gray.png" mode=""></image>
 					</view>
 				</view>
 				<view class="inner">
@@ -181,11 +181,11 @@
 								@click="articleCateChange(item)">
 								<view class="text">
 									{{ item.cateName }}
-									<image v-show="item.cateId == cateId" class="tab-bg" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/tab_bg.png" mode=""></image>
+									<image v-show="item.cateId == cateId" class="tab-bg" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/tab_bg.png" mode=""></image>
 								</view>
 							</view>
 						</view>
-						<image class="right-mask" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/mask.png" mode=""></image>
+						<image class="right-mask" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/mask.png" mode=""></image>
 					</view>
 					 
 					<view class="know-list">
@@ -196,11 +196,11 @@
 									<view class="readers">
 										<view class="head-box" v-if="item.viewsList!=null&&item.viewsList.length>0">
 											<view class="head" v-for="(subitem,j) in item.viewsList" :key="j" v-if="subitem!=null" >
-												<image :src="subitem.avatar==null?'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/detault_head.png':subitem.avatar" mode=""></image>
+												<image :src="subitem.avatar==null?'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/detault_head.png':subitem.avatar" mode=""></image>
 											</view>
 										</view>
 										<view class="readings">
-											<image class="eye" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/eye.png" mode=""></image>
+											<image class="eye" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/eye.png" mode=""></image>
 											<text class="num">{{item.views}}</text>
 										</view>
 									</view>
@@ -224,7 +224,7 @@
 		<!-- 限时消息 -->
 		<!-- <view class="message-box" >
 			<view class="left">
-				<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/close24.png" mode="" @click="closeMsg"></image>
+				<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/close24.png" mode="" @click="closeMsg"></image>
 				<view class="text ellipsis">关注公众号了解更新</view>
 			</view>
 			<view class="btn">查看</view>
@@ -278,7 +278,7 @@
 	import {
 		getStoreConfig
 	} from '@/api/common'
-	// import tabBg from "https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/tab_bg.png"
+	// import tabBg from "https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/tab_bg.png"
 	import freeAudio from '@/components/chengpeng-audio/free-audio.vue'
 	import Menu from '@/components/Menu.vue'
 	import HotProduct from './components/HotProduct.vue'
@@ -311,7 +311,7 @@
 				}, {
 					text: '确定',
 					color: '#FFFFFF',
-					bgColor: '#2BC7B9',
+					bgColor: '#FC581C',
 					width: '150rpx',
 					height: '80rpx',
 					shape: 'fillet',
@@ -343,7 +343,7 @@
 				articles: [], //养生干货
 				// 状态栏的高度
 				statusBarHeight: uni.getStorageSync('menuInfo').statusBarHeight,
-				tabBg: "https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/tab_bg.png", // tab切换背景
+				tabBg: "https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/tab_bg.png", // tab切换背景
 				// 问诊案例类型
 				orderTypes: [{
 					name: '全部',
@@ -458,9 +458,9 @@
 		},
 		onShareAppMessage(res) {
 			return {
-				title: '食养生活-您的专属健康解决方案',
+				title: '红蚂蚁一-您的专属健康解决方案',
 				path: `/pages/common/launch`,
-				imageUrl: 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+				imageUrl: 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 			}
 		},
 		onReachBottom() {
@@ -470,16 +470,16 @@
 		//分享到朋友圈
 		onShareTimeline(res) {
 			return {
-				title: '食养生活-您的专属健康解决方案',
+				title: '红蚂蚁一-您的专属健康解决方案',
 				query: '', //页面参数
-				imageUrl: 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+				imageUrl: 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 			}
 		},
 		computed: {
 			// 计算属性的 getter
 			bgColor: function() {
 				var top = this.top / 30;
-				return 'rgba(59, 167, 55, ' + top + ')';
+				return 'rgba(255, 115,70 ,' + top + ')';
 			},
 		},
 		onShow() {
@@ -535,7 +535,10 @@
 				})
 			},
 			getUserInfo() {
-				getUserInfo().then(
+				const data={
+					appId:wx.getAccountInfoSync().miniProgram.appId,
+				}
+				getUserInfo(data).then(
 					res => {
 						if (res.code == 200) {
 							if (res.user != null) {
@@ -987,10 +990,10 @@
 		left: 0;
 		z-index: 1000;
 		transition: all 0.5s;
-		background-color: #2BC7B9;
+		background-color: #FC581C;
 
 		&.show-back {
-			// background: linear-gradient(135deg, #66b2ef 0%, #2BC7B9 100%);
+			// background: linear-gradient(135deg, #ef9266 0%, #FC581C 100%);
 		}
 
 		.status_bar {
@@ -1029,7 +1032,7 @@
 					font-size: 42upx;
 					font-family: Source Han Sans CN;
 					font-weight: bold;
-					color: #FFFFFF;
+					color: #000;
 					padding-left: 41upx;
 				}
 
@@ -1113,7 +1116,7 @@
 					padding: 5upx 20rpx;
 					font-size: 24upx;
 					color: #FFFFFF;
-					background-color: #2BC7B9;
+					background-color: #FC581C;
 					border-radius: 50rpx;
 				}
 			}
@@ -1256,7 +1259,7 @@
 							}
 
 							.active {
-								color: #2BC7B9;
+								color: #FC581C;
 							}
 						}
 
@@ -1427,7 +1430,7 @@
 									font-family: PingFang SC;
 									font-weight: 500;
 									color: #FFFFFF;
-									background: #2BC7B9;
+									background: #FC581C;
 									border-radius: 10upx 4upx 10upx 4upx;
 									margin-right: 12upx;
 								}
@@ -1526,14 +1529,14 @@
 									.label {
 										font-size: 26upx;
 										font-weight: 500;
-										color: #2BC7B9;
+										color: #FC581C;
 										margin-right: 5upx;
 									}
 
 									.num {
 										font-size: 28upx;
 										font-weight: bold;
-										color: #2BC7B9;
+										color: #FC581C;
 									}
 								}
 							}
@@ -1553,7 +1556,7 @@
 						font-size: 26rpx;
 						font-family: PingFang SC;
 						font-weight: bold;
-						color: #2BC7B9;
+						color: #FC581C;
 
 						image {
 							margin-left: 8rpx;
@@ -2511,7 +2514,7 @@
 
 									.price {
 										padding: 5rpx 10rpx;
-										background-color: #2BC7B9;
+										background-color: #FC581C;
 										border-radius: 30rpx;
 										font-size: 20upx;
 										font-family: PingFang SC;
@@ -2581,7 +2584,7 @@
 				font-size: 28upx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #2BC7B9;
+				color: #FC581C;
 			}
 		}
 
@@ -2595,7 +2598,7 @@
 			font-weight: 500;
 			color: #FFFFFF;
 			border: 1px solid #D2E6FF;
-			background: linear-gradient(135deg, #66b2ef 0%, #2BC7B9 100%);
+			background: linear-gradient(135deg, #ef9266 0%, #FC581C 100%);
 			border-radius: 24upx;
 			margin-left: 30upx;
 		}

pages/home/new/articleDetails.vue

@@ -15,7 +15,7 @@
 		<!-- 咨询按钮 -->
 		<view class="inquiry">
 			<view class="content">
-				<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/consult.png" mode=""></image>
+				<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/consult.png" mode=""></image>
 				<text class="text">咨询</text>
 				<button class="contact-btn" open-type="contact"></button>
 			</view>
@@ -173,7 +173,7 @@
 			font-family: PingFang SC;
 			font-weight: 500;
 			color: #FFFFFF;
-			background: #2BC7B9;
+			background: #FC581C;
 			border-radius: 40upx;
 			display: flex;
 			align-items: center;
@@ -218,7 +218,7 @@
 				font-size: 22upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #2BC7B9;
+				color: #FC581C;
 				line-height: 1;
 			}
 			 

pages/home/new/articleList.vue

@@ -4,7 +4,7 @@
 			<!-- 搜索框 -->
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/search.png" mode=""></image>
 					<input type="text" v-model="keyword" placeholder="输入关键字搜索" confirm-type="search" @confirm="doSearch" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 			</view>
@@ -27,7 +27,7 @@
 						<view class="info-box">
 							<view class="readers">
 								<view class="readings">
-									<image class="eye" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/eye.png" ></image>
+									<image class="eye" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/eye.png" ></image>
 									<text class="num">{{item.views}}</text>
 								</view>
 							</view>
@@ -211,15 +211,15 @@
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #2BC7B9;
+			color: #FC581C;
 			background: #ffffff;
-			border: 1px solid #2BC7B9;
+			border: 1px solid #FC581C;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #2BC7B9;
-				border: 1px solid #2BC7B9;
+				background: #FC581C;
+				border: 1px solid #FC581C;
 			}
 		}
 	}

pages/home/new/chineseMedicineDetails.vue

@@ -61,7 +61,7 @@
 				return {
 					title: this.item.medicineName,
 					path: '/pages_index/chineseMedicineDetails?id='+this.id,
-					imageUrl: 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
@@ -71,7 +71,7 @@
 			if(this.utils.isLogin()){
 				return {
 					title: this.item.title,
-					imageUrl: 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
@@ -123,7 +123,7 @@
 					border-radius: 5rpx;
 					width: 8rpx;
 					height:30rpx;
-					background-color: #2BC7B9;
+					background-color: #FC581C;
 				}
 				.title{
 					margin-left: 15rpx;
@@ -155,7 +155,7 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				// border: 1rpx solid #2BC7B9;
+				// border: 1rpx solid #FC581C;
 				border-radius: 30rpx;
 				line-height: 60rpx;
 				.tab1{
@@ -207,7 +207,7 @@
 					font-family: PingFang SC;
 				}
 				.active{
-					background-color: #2BC7B9;
+					background-color: #FC581C;
 					color: #fff;
 				}
 				 

pages/home/new/chineseMedicineList.vue

@@ -4,7 +4,7 @@
 			<!-- 搜索框 -->
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/search.png" mode=""></image>
 					<input type="text" v-model="keyword" placeholder="输入关键字搜索" confirm-type="search" @confirm="doSearch" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 			</view>
@@ -12,7 +12,7 @@
 				 <u-tabs
 				  :scrollable="false"
 				  :list="tabs"  
-				  lineColor="#2BC7B9"
+				  lineColor="#FC581C"
 				 @change="tabChange">
 				 </u-tabs>
 			</view>
@@ -38,7 +38,7 @@
 					<view class="r-item" @click="showDetail(item)" v-for="item in dataList">
 						<view class="r-left">{{item.medicineName}}</view>
 						<view class="r-right">
-							<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/fire.png"></image>
+							<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/fire.png"></image>
 						</view>
 					</view>
 				</view>
@@ -242,14 +242,14 @@
 						border-radius: 5rpx;
 						width: 8rpx;
 						height:30rpx;
-						background-color: #2BC7B9;
+						background-color: #FC581C;
 					}
 					
 				}
 				.active{
 					background-color: #fff;
 					font-weight: bold;
-					color: #2BC7B9;
+					color: #FC581C;
 				}
 			}
 			
@@ -268,7 +268,7 @@
 				font-size: 40upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #2BC7B9;
+				color: #FC581C;
 				line-height: 80upx;
 			}
 			.items{

pages/home/new/diseaseDetails.vue

@@ -45,7 +45,7 @@
 				return {
 					title: this.item.diseaseName,
 					path: '/pages_index/diseaseDetails?id='+this.diseaseId,
-					imageUrl: 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
@@ -55,7 +55,7 @@
 			if(this.utils.isLogin()){
 				return {
 					title: this.item.diseaseName,
-					imageUrl: 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
@@ -102,7 +102,7 @@
 			.line{
 				width: 6rpx;
 				height:30rpx;
-				background-color: #2BC7B9;
+				background-color: #FC581C;
 				 
 			}
 			.title{

pages/home/new/diseaseList.vue

@@ -4,7 +4,7 @@
 			<!-- 搜索框 -->
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/search.png" mode=""></image>
 					<input type="text" v-model="keyword" placeholder="输入关键字搜索" confirm-type="search" @confirm="doSearch" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 			</view>
@@ -27,7 +27,7 @@
 						<view class="title ellipsis1">{{ item.diseaseName }}</view>
 					</view>
 					<view class="right">
-						<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/arrow_gray.png"></image>
+						<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/arrow_gray.png"></image>
 					</view>
 				</view>
 			</view>
@@ -205,15 +205,15 @@
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #2BC7B9;
+			color: #FC581C;
 			background: #ffffff;
-			border: 1px solid #2BC7B9;
+			border: 1px solid #FC581C;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #2BC7B9;
-				border: 1px solid #2BC7B9;
+				background: #FC581C;
+				border: 1px solid #FC581C;
 			}
 		}
 	}

pages/home/new/famousPrescribeDetails.vue

@@ -61,7 +61,7 @@
 				return {
 					title: this.item.prescribeName,
 					path: '/pages_index/famousPrescribeDetails?id='+this.id,
-					imageUrl: 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
@@ -71,7 +71,7 @@
 			if(this.utils.isLogin()){
 				return {
 					title: this.item.title,
-					imageUrl: 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
@@ -123,7 +123,7 @@
 					border-radius: 5rpx;
 					width: 8rpx;
 					height:30rpx;
-					background-color: #2BC7B9;
+					background-color: #FC581C;
 				}
 				.title{
 					margin-left: 15rpx;
@@ -155,7 +155,7 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				// border: 1rpx solid #2BC7B9;
+				// border: 1rpx solid #FC581C;
 				border-radius: 30rpx;
 				line-height: 60rpx;
 				.tab1{
@@ -207,7 +207,7 @@
 					font-family: PingFang SC;
 				}
 				.active{
-					background-color: #2BC7B9;
+					background-color: #FC581C;
 					color: #fff;
 				}
 				 

pages/home/new/famousPrescribeList.vue

@@ -4,7 +4,7 @@
 			<!-- 搜索框 -->
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/search.png" mode=""></image>
 					<input type="text" v-model="keyword" placeholder="输入关键字搜索" confirm-type="search" @confirm="doSearch" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 			</view>
@@ -12,7 +12,7 @@
 				 <u-tabs
 				  :scrollable="false"
 				  :list="tabs"  
-				  lineColor="#2BC7B9"
+				  lineColor="#FC581C"
 				 @change="tabChange">
 				 </u-tabs>
 			</view>
@@ -41,7 +41,7 @@
 					<view class="r-item" @click="showDetail(item)" v-for="item in dataList">
 						<view class="r-left">{{item.prescribeName}}</view>
 						<view class="r-right">
-							<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/fire.png"></image>
+							<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/fire.png"></image>
 						</view>
 					</view>
 				</view>
@@ -269,14 +269,14 @@
 						border-radius: 5rpx;
 						width: 8rpx;
 						height:30rpx;
-						background-color: #2BC7B9;
+						background-color: #FC581C;
 					}
 					
 				}
 				.active{
 					background-color: #fff;
 					font-weight: bold;
-					color: #2BC7B9;
+					color: #FC581C;
 				}
 			}
 			
@@ -295,7 +295,7 @@
 				font-size: 40upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #2BC7B9;
+				color: #FC581C;
 				line-height: 80upx;
 			}
 			.items{

pages/home/new/medicatedFoodDetails.vue

@@ -39,7 +39,7 @@
 				return {
 					title: this.item.foodName,
 					path: '/pages_index/medicatedFoodDetails?id='+this.id,
-					imageUrl: 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
@@ -49,7 +49,7 @@
 			if(this.utils.isLogin()){
 				return {
 					title: this.item.title,
-					imageUrl: 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
@@ -98,7 +98,7 @@
 					border-radius: 5rpx;
 					width: 8rpx;
 					height:30rpx;
-					background-color: #2BC7B9;
+					background-color: #FC581C;
 				}
 				.title{
 					margin-left: 15rpx;
@@ -130,7 +130,7 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				// border: 1rpx solid #2BC7B9;
+				// border: 1rpx solid #FC581C;
 				border-radius: 30rpx;
 				line-height: 60rpx;
 				.tab1{
@@ -182,7 +182,7 @@
 					font-family: PingFang SC;
 				}
 				.active{
-					background-color: #2BC7B9;
+					background-color: #FC581C;
 					color: #fff;
 				}
 				 

pages/home/new/medicatedFoodList.vue

@@ -4,7 +4,7 @@
 			<!-- 搜索框 -->
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/search.png" mode=""></image>
 					<input type="text" v-model="keyword" placeholder="输入关键字搜索" confirm-type="search" @confirm="doSearch" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 			</view>
@@ -225,15 +225,15 @@
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #2BC7B9;
+			color: #FC581C;
 			background: #ffffff;
-			border: 1px solid #2BC7B9;
+			border: 1px solid #FC581C;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #2BC7B9;
-				border: 1px solid #2BC7B9;
+				background: #FC581C;
+				border: 1px solid #FC581C;
 			}
 		}
 	}

pages/home/new/questionsDetails.vue

@@ -36,7 +36,7 @@
 				return {
 					title: this.item.vesselName,
 					path: '/pages_index/questionsDetails?id='+this.id,
-					imageUrl: 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
@@ -46,7 +46,7 @@
 			if(this.utils.isLogin()){
 				return {
 					title: this.item.title,
-					imageUrl: 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
@@ -169,7 +169,7 @@
 			font-family: PingFang SC;
 			font-weight: 500;
 			color: #FFFFFF;
-			background: #2BC7B9;
+			background: #FC581C;
 			border-radius: 40upx;
 			display: flex;
 			align-items: center;
@@ -214,7 +214,7 @@
 				font-size: 22upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #2BC7B9;
+				color: #FC581C;
 				line-height: 1;
 			}
 			 

pages/home/new/questionsList.vue

@@ -4,7 +4,7 @@
 			<!-- 搜索框 -->
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/search.png" mode=""></image>
 					<input type="text" v-model="keyword" placeholder="输入服务包搜索" confirm-type="search" @confirm="doSearch" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 			</view>
@@ -27,7 +27,7 @@
 						<view class="info-box">
 							<view class="readers">
 								<view class="readings">
-									<image class="eye" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/eye.png" ></image>
+									<image class="eye" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/eye.png" ></image>
 									<text class="num">{{item.views}}</text>
 								</view>
 							</view>
@@ -209,15 +209,15 @@
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #2BC7B9;
+			color: #FC581C;
 			background: #ffffff;
-			border: 1px solid #66b2ef   ;
+			border: 1px solid #ef9266   ;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #2BC7B9   ;
-				border: 1px solid #2BC7B9;
+				background: #FC581C   ;
+				border: 1px solid #FC581C;
 			}
 		}
 	}

pages/home/new/test.vue

@@ -6,7 +6,7 @@
 					<text class="patient-title">选择体验者</text>
 					<view class="right" >
 						<text class="value">请点击添加</text>
-						<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/arrow_gray.png" mode=""></image>
+						<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/arrow_gray.png" mode=""></image>
 					</view>
 				</view>
 				<view class="patient" @click="addPatient()" v-if="patient!=null">
@@ -20,7 +20,7 @@
 						</view>
 					</view>
 					<view class="right" >
-						<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/arrow_gray.png" mode=""></image>
+						<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/arrow_gray.png" mode=""></image>
 					</view>
 				</view>
 			</view>
@@ -59,7 +59,7 @@
 			<view class="patient-box" @click="addPatient()" v-if="patient==null">
 				<text class="patient-title">选择体验者</text>
 				<view class="right" >
-					<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/arrow_gray.png" mode=""></image>
+					<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/arrow_gray.png" mode=""></image>
 				</view>
 			</view>
 			<view class="patient" @click="addPatient()" v-if="patient!=null">
@@ -73,7 +73,7 @@
 					</view>
 				</view>
 				<view class="right" >
-					<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/arrow_gray.png" mode=""></image>
+					<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/arrow_gray.png" mode=""></image>
 				</view>
 			</view>
 		</view>
@@ -135,7 +135,7 @@
 				return {
 					title: "健康体质检测",
 					path: '/pages_index/test?tempId='+this.tempId,
-					imageUrl: 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
@@ -145,7 +145,7 @@
 			if(this.utils.isLogin()){
 				return {
 					title: "健康体质检测",
-					imageUrl: 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			

pages/home/new/testDetails.vue

@@ -49,7 +49,7 @@
 				return {
 					title: "健康自测",
 					path: '/pages_index/testDetails?tempId='+this.tempId,
-					imageUrl: 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
@@ -59,7 +59,7 @@
 			if(this.utils.isLogin()){
 				return {
 					title: "健康自测",
-					imageUrl: 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
@@ -215,7 +215,7 @@
 			 		font-family: PingFang SC;
 			 		font-weight: bold;
 			 		color: #FFFFFF;
-			 		background: #2BC7B9;
+			 		background: #FC581C;
 			 		border-radius: 50upx;
 			 	}
 			 }

pages/home/new/testList.vue

@@ -63,7 +63,7 @@
 				return {
 					title: "健康自测",
 					path: '/pages_index/testList',
-					imageUrl: 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
@@ -73,7 +73,7 @@
 			if(this.utils.isLogin()){
 				return {
 					title: "健康自测",
-					imageUrl: 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
@@ -183,7 +183,7 @@
 					.people-num{
 						font-size: 24upx;
 						font-family: PingFang SC;
-						color: #2BC7B9;
+						color: #FC581C;
 						.num{
 							font-weight: bold;
 							color: #814E1B;
@@ -194,7 +194,7 @@
 						font-size: 24upx;
 						font-family: PingFang SC;
 						font-weight: 500;
-						color: #2BC7B9;
+						color: #FC581C;
 					}
 				}
 			}

pages/home/new/testResult.vue

@@ -172,8 +172,8 @@
 			.bg{
 				width: 100%;
 				height:100%;
-				// background-color: #2BC7B9;
-				// background: linear-gradient(#66b2ef, #2BC7B9);
+				// background-color: #FC581C;
+				// background: linear-gradient(#66b2ef, #FC581C);
 				position: fixed;
 				image{
 					width: 100%;
@@ -289,7 +289,7 @@
 								.title-line{
 									width: 8rpx;
 									height: 28rpx;
-									background: #2BC7B9;
+									background: #FC581C;
 									border-radius: 2px 2px 2px 2px;
 									opacity: 1;
 								}

pages/home/new/testResultImg.vue

@@ -189,7 +189,7 @@ page {
  		font-family: PingFang SC;
  		font-weight: 400;
  		color: #ffffff;
- 		background:#2BC7B9 !important;
+ 		background:#FC581C !important;
  		border-radius: 44upx;
  	}
  }

pages/home/new/vesselDetails.vue

@@ -41,7 +41,7 @@
 				return {
 					title: this.item.vesselName,
 					path: '/pages_index/vesselDetails?id='+this.id,
-					imageUrl: 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
@@ -51,7 +51,7 @@
 			if(this.utils.isLogin()){
 				return {
 					title: this.item.vesselName,
-					imageUrl: 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 			
@@ -100,7 +100,7 @@
 					border-radius: 5rpx;
 					width: 8rpx;
 					height:30rpx;
-					background-color: #2BC7B9;
+					background-color: #FC581C;
 				}
 				.title{
 					margin-left: 15rpx;
@@ -132,7 +132,7 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				// border: 1rpx solid #2BC7B9;
+				// border: 1rpx solid #FC581C;
 				border-radius: 30rpx;
 				line-height: 60rpx;
 				.tab1{
@@ -184,7 +184,7 @@
 					font-family: PingFang SC;
 				}
 				.active{
-					background-color: #2BC7B9;
+					background-color: #FC581C;
 					color: #fff;
 				}
 				 

pages/home/new/vesselList.vue

@@ -4,7 +4,7 @@
 			<!-- 搜索框 -->
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/search.png" mode=""></image>
 					<input type="text" v-model="keyword" placeholder="输入关键字搜索" confirm-type="search" @confirm="doSearch" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 			</view>
@@ -12,7 +12,7 @@
 				 <u-tabs
 				  :scrollable="false"
 				  :list="tabs"  
-				  lineColor="#2BC7B9"
+				  lineColor="#FC581C"
 				 @change="tabChange">
 				 </u-tabs>
 			</view>
@@ -37,7 +37,7 @@
 					<view class="r-item" @click="showDetail(item)" v-for="item in dataList">
 						<view class="r-left">{{item.vesselName}}</view>
 						<view class="r-right">
-							<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/fire.png"></image>
+							<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/fire.png"></image>
 						</view>
 					</view>
 				</view>
@@ -242,14 +242,14 @@
 						border-radius: 5rpx;
 						width: 8rpx;
 						height:30rpx;
-						background-color: #2BC7B9;
+						background-color: #FC581C;
 					}
 					
 				}
 				.active{
 					background-color: #fff;
 					font-weight: bold;
-					color: #2BC7B9;
+					color: #FC581C;
 					padding-left: 0;
 					width: 100%;
 				}
@@ -270,7 +270,7 @@
 				font-size: 40upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #2BC7B9;
+				color: #FC581C;
 				line-height: 80upx;
 			}
 			.items{

pages/home/productList.vue

@@ -4,12 +4,12 @@
 			<!-- 搜索框 -->
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/search.png" mode=""></image>
 					<input type="text" @confirm="goSearch"   :value="form.productName" placeholder="输入产品名称" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 				<view class="icon-search">
-					<image @click="showChange(2)" v-if="showType==1"  src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/search1.png" mode=""></image>
-					<image @click="showChange(1)" v-if="showType==2"  src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/search2.png" mode=""></image>
+					<image @click="showChange(2)" v-if="showType==1"  src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/search1.png" mode=""></image>
+					<image @click="showChange(1)" v-if="showType==2"  src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/search2.png" mode=""></image>
 				</view>
 			</view>
 			<!-- 排序框 -->
@@ -20,19 +20,19 @@
 				<view class="item" @click="searchChange('2')">
 					<text class="label">价格</text>
 					<view class="sort-img">
-						<image v-if="form.priceOrder==null||form.priceOrder=='desc'" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/price_arrow_up.png" mode="" @click="priceUp(true)"></image>
-						<image v-if="form.priceOrder=='asc'" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/price_arrow_up2.png" mode="" @click="priceUp(false)"></image>
-						<image v-if="form.priceOrder==null||form.priceOrder=='asc'" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/price_arrow_down.png" mode="" @click="priceDown(true)"></image>
-						<image v-if="form.priceOrder=='desc'" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/price_arrow_down2.png" mode="" @click="priceDown(false)"></image>
+						<image v-if="form.priceOrder==null||form.priceOrder=='desc'" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/price_arrow_up.png" mode="" @click="priceUp(true)"></image>
+						<image v-if="form.priceOrder=='asc'" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/price_arrow_up2.png" mode="" @click="priceUp(false)"></image>
+						<image v-if="form.priceOrder==null||form.priceOrder=='asc'" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/price_arrow_down.png" mode="" @click="priceDown(true)"></image>
+						<image v-if="form.priceOrder=='desc'" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/price_arrow_down2.png" mode="" @click="priceDown(false)"></image>
 					</view>
 				</view>
 				<view class="item" @click="searchChange('3')">
 					<text class="label">销量</text>
 					<view class="sort-img">
-						<image v-if="form.salesOrder==null||form.salesOrder=='desc'" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/price_arrow_up.png" mode="" @click="saleUp(true)"></image>
-						<image v-if="form.salesOrder=='asc'" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/price_arrow_up2.png" mode="" @click="saleUp(false)"></image>
-						<image v-if="form.salesOrder==null||form.salesOrder=='asc'" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/price_arrow_down.png" mode="" @click="saleDown(true)"></image>
-						<image v-if="form.salesOrder=='desc'" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/price_arrow_down2.png" mode="" @click="saleDown(false)"></image>
+						<image v-if="form.salesOrder==null||form.salesOrder=='desc'" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/price_arrow_up.png" mode="" @click="saleUp(true)"></image>
+						<image v-if="form.salesOrder=='asc'" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/price_arrow_up2.png" mode="" @click="saleUp(false)"></image>
+						<image v-if="form.salesOrder==null||form.salesOrder=='asc'" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/price_arrow_down.png" mode="" @click="saleDown(true)"></image>
+						<image v-if="form.salesOrder=='desc'" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/price_arrow_down2.png" mode="" @click="saleDown(false)"></image>
 					</view>
 				</view>
 				<view class="item" :class="form.newOrder=='desc'?'active':''" @click="searchChange('4')">
@@ -50,7 +50,7 @@
 					</view>
 					<view class="info-box">
 						<view class="title ellipsis2">{{item.productName}}</view>
-						<view class="intro ellipsis">{{item.productInfo}}</view>
+						<view class="intro ellipsis">{{item.productInfo||''}}</view>
 						<view class="prce-num">
 							<view class="price">
 								<text class="unit">¥</text>
@@ -58,7 +58,7 @@
 								<text class="old">¥{{item.otPrice.toFixed(2)}} </text>
 							</view>
 							<view class="cart-img" @click="navgetTo('../shopping/cart')">
-								<view class="sale">已售 {{item.sales}} {{item.unitName}}</view>
+								<view class="sale">已售 {{item.sales}} {{item.unitName||''}}</view>
 							</view>
 						</view>
 					</view>
@@ -111,7 +111,7 @@
 					},
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					empty: {
-						icon:'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/no_data.png',
+						icon:'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/no_data.png',
 						tip: '暂无数据'
 					},
 					textNoMore:"已经到底了",
@@ -302,7 +302,7 @@
 			align-items: center;
 			justify-content: center;
 			&.active .label{
-				color: #2BC7B9;
+				color: #FC581C;
 			}
 			.label{
 				font-size: 26upx;

pages/home/productSearch.vue

@@ -3,14 +3,14 @@
 		<!-- 搜索框 -->
 		<view class="search-cont">
 			<view class="inner">
-				<image class="icon-search" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/search.png" mode=""></image>
+				<image class="icon-search" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/search.png" mode=""></image>
 				<input type="text" value="" placeholder="输入产品名称" confirm-type="搜索" @confirm="goSearch" :focus='setFocus' placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 			</view>
 		</view>
 		<!-- 搜索历史 -->
 		<view class="title-box">
 			<text class="title">历史搜索</text>
-			<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/del.png" mode="" @click="clearHistory"></image>
+			<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/del.png" mode="" @click="clearHistory"></image>
 		</view>
 		<view class="data-list">
 			<view class="item" v-for="(item,index) in searchHistory" :key="index" @click="doSearch(item)">

pages/index/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<image class="logo" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logo.png"></image>
+		<image class="logo" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logo.png"></image>
 		<view class="text-area">
 			<text class="title">{{title}}</text>
 		</view>

pages/shopping/cart.vue

@@ -10,7 +10,7 @@
 				<view class="info-box">
 					<view>
 						<view class="title-box">
-							<view class="tag">{{utils.getDictLabelName("storeProductType",item.productType)}}</view>
+							<!-- <view class="tag">{{utils.getDictLabelName("storeProductType",item.productType)}}</view> -->
 							<view class="title ellipsis">{{ item.productName }}</view>
 						</view>
 						<view class="intro ellipsis">{{item.productAttrName}}</view>
@@ -22,12 +22,12 @@
 						</view>
 						<view class="num-box">
 							<view class="img-box" @click="delNum(item)">
-								<image v-if="item.cartNum <= 1" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/jian.png" mode=""></image>
-								<image v-else src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/jian2.png" mode=""></image>
+								<image v-if="item.cartNum <= 1" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/jian.png" mode=""></image>
+								<image v-else src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/jian2.png" mode=""></image>
 							</view>
 							<input  type="number" @change="changeNum($event,item)" :value="item.cartNum"   />
 							<view class="img-box" @click="addNum(item)">
-								<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/add.png" mode=""></image>
+								<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/add.png" mode=""></image>
 							</view>
 						</view>
 					</view>
@@ -36,7 +36,7 @@
 		</view>
 	 
 		<view v-if="carts.length == 0" class="no-data-box">
-			<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/no_data.png" mode="aspectFit"></image>
+			<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/no_data.png" mode="aspectFit"></image>
 			<view class="empty-title">暂无数据</view>
 		</view>
 		<!-- 猜你喜欢 -->
@@ -116,6 +116,7 @@
 							uni.showToast({
 								icon:'none',
 								title: res.msg,
+								duration: 2000
 							});
 						}
 					},
@@ -198,7 +199,8 @@
 						}else{
 							uni.showToast({
 								icon:'none',
-								title: "请求失败",
+								title: res.msg,
+								duration: 2000
 							});
 						}
 					},
@@ -229,6 +231,7 @@
 					uni.showToast({
 						icon:'none',
 						title: `本商品限购${item.purchaseLimit}件，您已购买${item.purchaseLimit}件，本次最多可购买${item.purchaseLimit}件`,
+						duration: 2000
 					});
 					return
 				}
@@ -236,6 +239,7 @@
 					uni.showToast({
 						icon:'none',
 						title: `本商品库存${item.stock}件，您已购买${item.stock}件，本次最多可购买${item.stock}件`,
+						duration: 2000
 					});
 					return
 				}
@@ -315,7 +319,7 @@
 							font-family: PingFang SC;
 							font-weight: bold;
 							color: #FFFFFF;
-							background: linear-gradient(90deg, #66b2ef 0%, #2BC7B9 100%);
+							background: linear-gradient(90deg, #ef9266 0%, #FC581C 100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							flex-shrink: 0;
@@ -466,7 +470,7 @@
 					font-family: PingFang SC;
 					font-weight: bold;
 					color: #FFFFFF;
-					background: #3BA737;
+					background: #FC581C;
 					border-radius: 44upx;
 				}
 			}

pages/shopping/confirmOrder.vue

@@ -10,7 +10,7 @@
 					</vie>
 				</view>
 				<view class="arrow-box">
-					<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/arrow_gray.png" mode=""></image>
+					<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/arrow_gray.png" mode=""></image>
 				</view>
 			</view>
 			<view class="address-box" v-if="address!=null" @click="openAddress()">
@@ -24,7 +24,7 @@
 					</view>
 				</view>
 				<view class="arrow-box">
-					<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/arrow_gray.png" mode=""></image>
+					<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/arrow_gray.png" mode=""></image>
 				</view>
 			</view>
 			<!-- 药品列表 -->
@@ -36,7 +36,8 @@
 					<view class="info-box">
 						<view>
 							<view class="name-box ellipsis2">
-								<view class="tag">{{utils.getDictLabelName("storeProductType",item.productType)}}</view>{{item.productName}}
+								<!-- <view class="tag">{{utils.getDictLabelName("storeProductType",item.productType)}}</view> -->
+								{{item.productName}}
 							</view>
 							<view class="spec ellipsis2">{{item.productAttrName}}</view>
 						</view>
@@ -61,12 +62,12 @@
 			<!-- 积分 -->
 			<view class="points mt20" style="border-radius:16rpx 16rpx 0 0;">
 				<view class="left">
-					<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/points.png" mode=""></image>
+					<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/points.png" mode=""></image>
 					<text class="text">可用积分</text>
 				</view>
 				<view class="right">
 					<text class="text">{{price.usedIntegral}}积分</text>
-					<evan-switch @change="integralChange" v-model="checked" activeColor="#2BC7B9" inactiveColor="rgba(0, 0, 0, 0.1)"></evan-switch>
+					<evan-switch @change="integralChange" v-model="checked" activeColor="#FC581C" inactiveColor="rgba(0, 0, 0, 0.1)"></evan-switch>
 				</view>
 			</view>
 			<view class="points" @click="openCoupon(0)">
@@ -75,7 +76,7 @@
 				</view>
 				<view class="right">
 					<text class="text">{{couponText}}</text>
-					<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/arrow4.png" mode=""></image>
+					<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/arrow4.png" mode=""></image>
 				</view>
 			</view>
 			<view class="points" @click="openCoupon(3)">
@@ -84,7 +85,7 @@
 				</view>
 				<view class="right">
 					<text class="text">{{DirectText}}</text>
-					<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/arrow4.png" mode=""></image>
+					<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/arrow4.png" mode=""></image>
 				</view>
 			</view>
 			<view class="points " style="border-radius:0 0 16rpx 16rpx;">
@@ -118,8 +119,8 @@
 				 <view class="coupon-list" v-if="couponsList.length > 0">
 				   <view class="item acea-row row-center-wrapper"  v-for="(item, index) in couponsList" :key="index">
 				     <view class="money" >
-				       <image v-if="item.status==0" class="img" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/coupon1.png" mode="widthFix"></image>
-				 	  <image v-if="item.status!=0" class="img" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/coupon2.png" mode="widthFix"></image>
+				       <image v-if="item.status==0" class="img" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/coupon1.png" mode="widthFix"></image>
+				 	  <image v-if="item.status!=0" class="img" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/coupon2.png" mode="widthFix"></image>
 				 	  <view style="z-index: 999;">
 				         ￥<span class="num">{{ item.couponPrice }}</span>
 				       </view>
@@ -138,28 +139,27 @@
 				   </view>
 				 </view>
 				 <view v-if="couponsList.length == 0" class="no-data-box" >
-				 	<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/no_data.png" mode="aspectFit"></image>
+				 	<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/no_data.png" mode="aspectFit"></image>
 				 	<view class="empty-title">暂无数据</view>
 				 </view>
 			 </view>
-			 
 		</popupBottom>
+		<ykscreenRecord></ykscreenRecord>
 	</view>
 </template>
 
 <script>
 	import {getWeixinOrderTemps} from '@/api/common'
-	
 	import {confirm,computed,create} from '@/api/storeOrder'
 	import { getMyEnableCouponList } from '@/api/coupon'
-	 
 	import EvanSwitch from '@/components/evan-switch/evan-switch.vue'
 	import popupBottom from '@/components/px-popup-bottom/px-popup-bottom.vue'
-	
+	import ykscreenRecord from "@/components/yk-screenRecord/yk-screenRecord.vue"
 	export default {
 		components: {
 			EvanSwitch,
-			popupBottom
+			popupBottom,
+			ykscreenRecord
 		},
 		data() {
 			return {
@@ -430,7 +430,7 @@
 			min-height: 171upx;
 			background: #FFFFFF;
 			border-radius: 16upx;
-			background-image: url("https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/address_bg.png");
+			background-image: url("https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/address_bg.png");
 			background-repeat: no-repeat;
 			background-size: 100% 30upx;
 			background-position: left bottom;
@@ -511,7 +511,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #66b2ef 0%, #2BC7B9 100%);
+							background: linear-gradient(90deg, #ef9266 0%, #FC581C 100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -718,7 +718,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #2BC7B9;
+				background: #FC581C;
 				border-radius: 44upx;
 			}
 		}

pages/shopping/index.vue

@@ -355,13 +355,13 @@
 					position: relative;
 
 					&.active {
-						color: #018C39;
+						color: #FC581C;
 
 						&::after {
 							content: "";
 							width: 8upx;
 							height: 50upx;
-							background: #018C39;
+							background: #FC581C;
 							position: absolute;
 							top: 25upx;
 							left: 0;

pages/shopping/payOrder.vue

@@ -14,7 +14,7 @@
 				<view class="title">支付方式</view>
 				<view class="item">
 					<view class="left">
-						<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/wecha_pay.png" mode=""></image>
+						<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/wecha_pay.png" mode=""></image>
 						<text class="text">微信支付</text>
 					</view>
 					<label>
@@ -47,12 +47,17 @@
 		<view class="btn-box">
 			<view class="btn" @click="payOrder()">去支付</view>
 		</view>
+		<ykscreenRecord></ykscreenRecord>
 	</view>
 </template>
 
 <script>
 	import {pay,getStoreOrderById} from '@/api/storeOrder'
+	import ykscreenRecord from "@/components/yk-screenRecord/yk-screenRecord.vue"
 	export default {
+		components: {
+			ykscreenRecord
+		},
 		data() {
 			return {
 				payLimitTime:null,
@@ -113,7 +118,7 @@
 				
 			},
 			payOrder(){
-				var data = {orderId:this.order.id};
+				var data = {orderId:this.order.id,appId:wx.getAccountInfoSync().miniProgram.appId};
 				var that=this;
 				uni.showLoading();
 				pay(data).then(
@@ -333,7 +338,7 @@
 				font-weight: bold;
 				color: #FFFFFF;
 				text-align: center;
-				background: #2BC7B9;
+				background: #FC581C;
 				border-radius: 44upx;
 			}
 		}

pages/shopping/paymentOrder.vue

@@ -18,7 +18,7 @@
 				<radio-group  @change="payTypeChange" v-if="order.isEditMoney!=null&&order.isEditMoney==1">
 					<view class="item"  >
 						<view class="left"  >
-							<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/wecha_pay.png" mode=""></image>
+							<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/wecha_pay.png" mode=""></image>
 							<text class="text">微信支付</text>
 						</view>
 						<label>
@@ -27,7 +27,7 @@
 					</view>
 					<view class="item"  >
 						<view class="left">
-							<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/pay_de.png" mode=""></image>
+							<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/pay_de.png" mode=""></image>
 							<text class="text">物流代收</text>
 						</view>
 						<label>
@@ -39,7 +39,7 @@
 				<radio-group @change="payTypeChange" v-else-if="order.orderCreateType!=null&& order.orderCreateType==3">
 					<view class="item"  >
 						<view class="left" >
-							<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/wecha_pay.png" mode=""></image>
+							<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/wecha_pay.png" mode=""></image>
 							<text class="text">微信支付</text>
 						</view>
 						<label>
@@ -48,7 +48,7 @@
 					</view>
 					<view class="item" >
 						<view class="left">
-							<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/pay_de.png" mode=""></image>
+							<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/pay_de.png" mode=""></image>
 							<text class="text">物流代收</text>
 						</view>
 						<label>
@@ -58,7 +58,7 @@
 					<!-- <view class="item" v-if="user!=null&&user.level==1 "> -->
 					<view class="item" >
 						<view class="left">
-							<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/pay_1.png" mode=""></image>
+							<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/pay_1.png" mode=""></image>
 							<text class="text">货到付款</text>
 						</view>
 						<label>
@@ -69,7 +69,7 @@
 				<radio-group @change="payTypeChange" v-else-if="order.orderCreateType!=null&& order.orderCreateType==2">
 					<view class="item" v-if="payType==1||payType==4" >
 						<view class="left" >
-							<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/wecha_pay.png" mode=""></image>
+							<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/wecha_pay.png" mode=""></image>
 							<text class="text">微信支付</text>
 						</view>
 						<label>
@@ -78,7 +78,7 @@
 					</view>
 					<view class="item" v-if="payType==2||payType==4">
 						<view class="left" >
-							<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/pay_de.png" mode=""></image>
+							<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/pay_de.png" mode=""></image>
 							<text class="text">物流代收</text>
 						</view>
 						<label>
@@ -88,7 +88,7 @@
 					<!-- <view class="item" v-if="user!=null&&user.level==1 "> -->
 					<view class="item" v-if="payType==1||payType==4" >
 						<view class="left">
-							<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/pay_1.png" mode=""></image>
+							<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/pay_1.png" mode=""></image>
 							<text class="text">货到付款</text>
 						</view>
 						<label>
@@ -99,7 +99,7 @@
 				<radio-group @change="payTypeChange" v-else-if="order.orderCreateType!=null&&(order.orderCreateType==1)">
 					<view class="item"  >
 						<view class="left" >
-							<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/wecha_pay.png" mode=""></image>
+							<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/wecha_pay.png" mode=""></image>
 							<text class="text">微信支付</text>
 						</view>
 						<label>
@@ -142,6 +142,7 @@
 				<button  class="share" data-name="shareBtn" open-type="share">分享</button>
 			</view> -->
 		</view>
+		<ykscreenRecord></ykscreenRecord>
 	</view>
 </template>
 
@@ -149,7 +150,11 @@
 	import {getUserInfo} from '@/api/user'
 	import {getStoreConfig} from '@/api/common'
 	import {editPayType,pay,getStoreOrderById,orderBindUser} from '@/api/storeOrder'
+	 import ykscreenRecord from "@/components/yk-screenRecord/yk-screenRecord.vue"
 	export default {
+		components: {
+			ykscreenRecord
+		},
 		data() {
 			return {
 				orderId:null,
@@ -179,7 +184,7 @@
 		// 	return {
 		// 		title: "帮TA支付",
 		// 		path: '/pages_user/user/otherPaymentOrder?orderId='+this.orderId,
-		// 		imageUrl: 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+		// 		imageUrl: 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 		// 	}
 			
 		// },
@@ -560,7 +565,7 @@
 				font-weight: bold;
 				color: #FFFFFF;
 				text-align: center;
-				background: #2BC7B9;
+				background: #FC581C;
 				border-radius: 44upx;
 				margin-bottom: 10rpx;
 			}
@@ -571,8 +576,8 @@
 				font-size: 30upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #2BC7B9;
-				border: 1rpx solid #2BC7B9;
+				color: #FC581C;
+				border: 1rpx solid #FC581C;
 				text-align: center;
 				background: #FFFFFF;
 				border-radius: 44upx;

pages/shopping/prescribe.vue

@@ -3,7 +3,7 @@
 		<view class="fixed-top-box">
 			<view class="status_bar" :style="{height: statusBarHeight}"></view>
 			<view class="back-box" @click="back">
-				<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/back_white.png" mode=""></image>
+				<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/back_white.png" mode=""></image>
 				<text class="title">填写处方信息</text>
 				<text></text>
 			</view>
@@ -13,17 +13,17 @@
 			<!-- 步骤 -->
 			<view class="steps-box">
 				<view class="item active">填写信息</view>
-				<image class="arrow" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/arrow4.png" mode=""></image>
+				<image class="arrow" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/arrow4.png" mode=""></image>
 				<view class="item">医生开方</view>
-				<image class="arrow" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/arrow4.png" mode=""></image>
+				<image class="arrow" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/arrow4.png" mode=""></image>
 				<view class="item">支付订单</view>
-				<image class="arrow" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/arrow4.png" mode=""></image>
+				<image class="arrow" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/arrow4.png" mode=""></image>
 				<view class="item">厂家发货</view>
 			</view>
 			<!-- 提示 -->
 			<view class="tip-box">
 				<view class="top">
-					<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/safe2.png" mode=""></image>
+					<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/safe2.png" mode=""></image>
 					<text class="text">依据国家规定、处方药需凭处方购买</text>
 				</view>
 				<view class="time-tip">填写问诊人信息、处方信息</view>
@@ -34,7 +34,7 @@
 					<view class="title-box">
 						<text class="title">选择问诊人</text>
 						<view class="add-box" @click="addPeople()">
-							<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/add26.png" mode=""></image>
+							<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/add26.png" mode=""></image>
 							<text >添加</text>
 						</view>
 					</view>
@@ -47,7 +47,7 @@
 								<text class="ege">{{utils.getAge(item.birthday)}}岁</text>
 							</view>
 							<!-- 选中的对号角标 -->
-							<image v-if="patientId == item.patientId" class="active-img" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/sel_right50.png" mode=""></image>
+							<image v-if="patientId == item.patientId" class="active-img" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/sel_right50.png" mode=""></image>
 						</view>
 					</view>
 				</view>
@@ -74,11 +74,11 @@
 						<view class="img" v-for="(item,index) in imgList" :key="index"  >
 							<image :src="item" mode="aspectFill"  @click="previewImage(index)"></image>
 							<view class="del" @click="delImg(index)" >
-								<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/del2.png"></image>
+								<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/del2.png"></image>
 							</view>
 						</view>
 						<view class="chose-img" @tap="chooseImage(1)" v-if="imgList.length<4">
-							<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/adds.png"></image>
+							<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/adds.png"></image>
 						</view>
 					</view>
 					
@@ -104,7 +104,7 @@
 				<!-- 是否使用过此药 -->
 				<view class="check-box">
 					<view class="left">
-						<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/yao.png" mode=""></image>
+						<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/yao.png" mode=""></image>
 						<text class="text">是否有过敏史</text>
 					</view>
 					<radio-group style="display: flex;align-items: center;">
@@ -120,7 +120,7 @@
 				</view>
 				<view class="check-box">
 					<view class="left">
-						<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/yao.png" mode=""></image>
+						<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/yao.png" mode=""></image>
 						<text class="text">肝功能是否异常</text>
 					</view>
 					<radio-group style="display: flex;align-items: center;">
@@ -136,7 +136,7 @@
 				</view>
 				<view class="check-box">
 					<view class="left">
-						<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/yao.png" mode=""></image>
+						<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/yao.png" mode=""></image>
 						<text class="text">肾功能是否异常</text>
 					</view>
 					<radio-group style="display: flex;align-items: center;">
@@ -152,7 +152,7 @@
 				</view>
 				<view class="check-box">
 					<view class="left">
-						<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/yao.png" mode=""></image>
+						<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/yao.png" mode=""></image>
 						<text class="text">是否是备孕/怀孕/哺乳期</text>
 					</view>
 					<radio-group style="display: flex;align-items: center;">
@@ -221,7 +221,7 @@
 				return {
 					title: "填写处方信息",
 					path: "/pages/shopping/prescribe?orderId="+this.orderId,
-					imageUrl: 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+					imageUrl: 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
 		},
@@ -439,7 +439,7 @@
 		justify-content: space-between;
 		.fixed-top-box{
 			width: 100%;
-			background: linear-gradient(135deg, #66b2ef 0%, #2BC7B9 100%);
+			background: linear-gradient(135deg, #ef9266 0%, #FC581C 100%);
 			position: fixed;
 			top: 0;
 			left: 0;
@@ -479,7 +479,7 @@
 					color: #666666;
 					&.active{
 						font-weight: bold;
-						color: #2BC7B9;
+						color: #FC581C;
 					}
 				}
 				.arrow{
@@ -574,7 +574,7 @@
 							}
 							&.active{
 								background: rgba(230, 250, 247, 0);
-								border: 2upx solid #2BC7B9;
+								border: 2upx solid #FC581C;
 								position: relative;
 							}
 							.active-img{
@@ -647,15 +647,15 @@
 							font-size: 28upx;
 							font-family: PingFang SC;
 							font-weight: 500;
-							color: #2BC7B9;
-							background: #F5FFFE;
+							color: #FC581C;
+							background: #fff9f5;
 							border: 1px solid #8AD5CE;
 							padding: 0 20upx;
 							border-radius: 32upx;
 							margin: 0 20upx 20upx 0;
 							&.active{
-								background: #2BC7B9;
-								border: 1px solid #2BC7B9;
+								background: #FC581C;
+								border: 1px solid #FC581C;
 								color: #FFFFFF;
 							}
 						}
@@ -821,7 +821,7 @@
 				font-weight: bold;
 				color: #FFFFFF;
 				text-align: center;
-				background: #2BC7B9;
+				background: #FC581C;
 				border-radius: 44upx;
 			}
 		}

pages/shopping/productDetails.vue

@@ -39,12 +39,13 @@
 				</view>
 				<view class="share-box" v-if="userinfo.isShow==1&&isuser==false">
 					<text class="text">分享</text>
-					<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/share1.png" mode=""></image>
+					<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/share1.png" mode=""></image>
 					<button  class="share" data-name="shareBtn" open-type="share">分享</button>
 				</view>
 			</view>
 			<view class="name-box">
-				<view class="tag">{{utils.getDictLabelName("storeProductType",product.productType)}}</view>{{product.productName}}
+				<!-- <view class="tag">{{utils.getDictLabelName("storeProductType",product.productType)}}</view> -->
+				{{product.productName}}
 			</view>
 			<view class="intro" v-if="product.productInfo!=null" v-html="product.productInfo.replace(/\n/g,'<br>')">
 			</view>
@@ -52,21 +53,20 @@
 				产品规格：{{attrs[0].attrValues}}
 			</view>
 			<view class="safe-box">
-				<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/safe.png" mode=""></image>
-				<text class="text" v-if="userinfo.isShow==1&&isuser==false">免邮发货</text>
-				<view class="line" v-if="userinfo.isShow==1&&isuser==false"></view>
-				<view class="line"></view>
+				<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/safe.png" mode=""></image>
+				<text class="text" >免邮发货</text>
+				<view class="line" ></view>
 				<text class="text">客服服务</text>
 				<view class="line"></view>
 				<text class="text">隐私保护</text>
 			</view>
 		</view>
 		<!-- 购买人数、库存 -->
-		<view class="inventor" v-if="userinfo.isShow==1&&isuser==false">
+		<view class="inventor">
 			<view class="left">
 				<!-- <view class="head-box">
 					<view class="head" v-for="(item,j) in 5" :key="j">
-						<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/head.jpg" mode=""></image>
+						<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/head.jpg" mode=""></image>
 					</view>
 				</view> --> 
 				<view class="num-box">
@@ -90,24 +90,24 @@
 		<view class="det-box">
 			<view class="title">图文详情</view>
 			<view class="inner">
-				<view  v-html="product.description" style="font-size:0"></view>
+				<u-parse :content="product.description" :tagStyle="style"></u-parse>
 			</view>
 		</view>
 		<!-- 底部按钮 -->
-		<view class="btn-foot" v-if="userinfo.isShow==1&&isuser==false">
+		<view class="btn-foot" >
 			<view class="menu-box">
 				<view class="item" @click="goHome">
-					<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/back_home.png" mode=""></image>
+					<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/back_home.png" mode=""></image>
 					<text class="label">首页</text>
 				</view>
 				<view class="item" style="position: relative;">
-					<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/consult_small.png" mode=""></image>
+					<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/consult_small.png" mode=""></image>
 					<text class="label">咨询</text>
 					<button class="contact-btn" open-type="contact"></button>
 				</view>
 				<view class="item" @click="navgetTo('./cart')">
 					<uni-badge size="small" :text="cartCount" absolute="rightTop" type="error">
-						<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/cart36.png" mode=""></image>
+						<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/cart36.png" mode=""></image>
 					</uni-badge>
 					<text class="label">购物车</text>
 				</view>
@@ -145,7 +145,7 @@
 							<view class="input-box">
 								<input type="text" v-model="storeName" placeholder="请选择门店" class="form-input" disabled="disabled" />
 							</view>
-							<image class="arrow" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/arrow_gray.png" mode=""></image>
+							<image class="arrow" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/arrow_gray.png" mode=""></image>
 						</view>
 					</picker>
 				</view> -->
@@ -170,12 +170,12 @@
 					<view class="label">数量</view>
 					<view class="num-box">
 						<view class="img-box" @click="lessNum()">
-							<image v-if="specNum <= 1" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/jian.png" mode=""></image>
-							<image v-else src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/jian2.png" mode=""></image>
+							<image v-if="specNum <= 1" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/jian.png" mode=""></image>
+							<image v-else src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/jian2.png" mode=""></image>
 						</view>
 						<input   type="number" @change="changeNum" v-model="specNum"   />
 						<view class="img-box" @click="addNum()">
-							<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/add.png" mode=""></image>
+							<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/add.png" mode=""></image>
 						</view>
 					</view>
 				</view>
@@ -184,10 +184,16 @@
 		</popupBottom>
 		
 		<view class="loadding" v-if="loadding==true">
-			<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logoshare.png"></image>
+			<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logoshare.png"></image>
 			<text class="text">加载中...</text>
 		</view>
 		<u-modal :show="showModal" title="温馨提示" content="处方药须凭处方在药师指导下购买和使用" @confirm="hideModal()"></u-modal>
+		<u-modal :show="showsales" title="温馨提示"  @confirm="hideModals()">
+			<view class="slot-content">
+				<u-parse :content="salesTit"></u-parse>
+			</view>
+		</u-modal>
+		<ykscreenRecord></ykscreenRecord>
 	</view>
 </template>
 
@@ -196,13 +202,19 @@
 	import {getUserInfo} from '@/api/user'
 	import {getProductDetails,getCartCount,addCart} from '@/api/product'
 	import popupBottom from '@/components/px-popup-bottom/px-popup-bottom.vue'
+	import ykscreenRecord from "@/components/yk-screenRecord/yk-screenRecord.vue"
 	export default {
 		components: {
 			item:{},
-			popupBottom
+			popupBottom,
+			ykscreenRecord
 		},
 		data() {
 			return {
+				style: {
+				  // 字符串的形式
+				  img: "display: block;",
+				},
 				loadding:true,
 				buyText:"立即购买",
 				// mTitle:"温馨提示",
@@ -238,7 +250,9 @@
 				showServiceFee:false,
 				selectVal:"",
 				userinfo:[],
-				isuser:false
+				isuser:false,
+				showsales:false,
+				salesTit:''
 			};
 		},
 		onLoad(options) {
@@ -298,7 +312,10 @@
 		},
 		methods: {
 			getuser(){
-				getUserInfo().then(
+				const data={
+					appId:wx.getAccountInfoSync().miniProgram.appId,
+				}
+				getUserInfo(data).then(
 					res => {
 						if (res.code == 200) {
 							if (res.user != null) {
@@ -370,11 +387,16 @@
 								});
 							}
 						}else{
-							uni.showToast({
-								icon:'none',
-								title: res.msg,
-							});
-							this.getProductDetails()
+							// uni.showToast({
+							// 	icon:'none',
+							// 	title: res.msg,
+							// 	duration:3000
+							// });
+							this.showsales=true
+							this.salesTit=res.msg
+							setTimeout(function(){
+								this.getProductDetails()
+							},1000)
 						}
 					},
 					rej => {}
@@ -544,6 +566,9 @@
 			hideModal(){
 				this.showModal=false;
 			},
+			hideModals(){
+				this.showsales=false;
+			},
 			getValueSelect(){
 				var valueSelect=this.values.filter((item)=>{
 				     return item.sku==this.selectVal;
@@ -587,7 +612,7 @@
 			left: 0;
 			bottom: 0;
 			z-index: 9;
-			background-image: url(https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/black_mask.png);
+			background-image: url(https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/black_mask.png);
 			background-size: 20upx 44upx;
 			background-repeat: repeat-x;
 		}
@@ -679,7 +704,7 @@
 			.share-box{
 				width: 120upx;
 				height: 46upx;
-				border: 1px solid #2BC7B9;
+				border: 1px solid #FC581C;
 				border-radius: 23upx;
 				display: flex;
 				align-items: center;
@@ -689,7 +714,7 @@
 					font-size: 26upx;
 					font-family: PingFang SC;
 					font-weight: 500;
-					color: #2BC7B9;
+					color: #FC581C;
 				}
 				image{
 					margin-left: 2rpx;
@@ -725,7 +750,7 @@
 				display: inline-block;
 				padding: 0 6upx;
 				height: 30upx;
-				background: linear-gradient(90deg, #66b2ef 0%, #2BC7B9 100%);
+				background: linear-gradient(90deg, #ef9266 0%, #FC581C 100%);
 				border-radius: 4upx;
 				margin-right: 10upx;
 				font-size: 22upx;
@@ -930,7 +955,7 @@
 					background: #FF6633;
 				}
 				&.buy{
-					background: #3BA737;
+					background: #FC581C;
 				}
 			}
 		}
@@ -1023,7 +1048,7 @@
 					&.active{
 						background: #F1FFFE;
 						border: 1px solid #8AD5CE;
-						color: #2BC7B9;
+						color: #FC581C;
 					}
 				}
 			}
@@ -1080,7 +1105,7 @@
 			font-family: PingFang SC;
 			font-weight: bold;
 			color: #FFFFFF;
-			background: #3BA737;
+			background: #FC581C;
 			border-radius: 44upx;
 			margin-top: 30upx;
 			// margin-bottom: 30upx;

pages/shopping/success.vue

@@ -3,7 +3,7 @@
 		<view class="inner">
 			<view class="top">
 				<text class="title">支付成功</text>
-				 <image class="icon" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/success.png" ></image>
+				 <image class="icon" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/success.png" ></image>
 				 <view   class="btn-box">
 				 	<view class="btn cancel" @click="goOrderDetails(order.id)"> 查看订单</view>
 				 </view>

pages/user/index.vue

@@ -7,7 +7,7 @@
 				<view class="user-info">
 					<view class="left">
 						<view class="head-img">
-							<image :src="user.avatar==null?'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/detault_head.png':user.avatar" mode="aspectFill"></image>
+							<image :src="user.avatar==null?'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/avatar.png':user.avatar" mode="aspectFill"></image>
 						</view>
 						<view class="name-phone"  v-if="UserInfo">
 							<view class="name">{{user.nickname}}
@@ -17,7 +17,7 @@
 								>非会员</text>
 							</view>
 							<view class="phone justify-start align-center ">
-								<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/phone_icon.png" class="w32 h32 mr10"></image>
+								<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/phone_icon.png" class="w32 h32 mr10"></image>
 								<text>{{utils.parsePhone(user.phone)}}</text>
 							</view>
 						</view>
@@ -27,12 +27,12 @@
 					<view class="right">
 						<uni-badge size="small" :text="msgNum" absolute="rightTop" type="error">
 							<view class="set" @click="navgetTo('/pages_user/user/personInfo')">
-								<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/icon-set.png" mode=""></image>
+								<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/icon-set.png" mode=""></image>
 							</view>
 						</uni-badge>
 						<!-- <uni-badge size="small" :text="msgNum" absolute="rightTop" type="error">
 							<view class="msg-box" @click="navgetTo('/pages_user/user/message')">
-								<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/icon-msg.png" mode=""></image>
+								<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/icon-msg.png" mode=""></image>
 							</view>
 							
 						</uni-badge> -->
@@ -45,35 +45,35 @@
 							<text class="title">我的订单</text>
 							<view class="all-order" @click="showOrder('')">
 								<text class="text">全部订单</text>
-								<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/arrow4.png" mode=""></image>
+								<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/arrow4.png" mode=""></image>
 							</view>
 						</view>
 						<view class="status-box">
 							<uni-badge size="small" :text=count0 absolute="rightTop" type="error">
 								<view class="item" @click="showOrder('0')">
-									<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/payment.png" mode=""></image>
+									<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/payment.png" mode=""></image>
 									<text class="text">待付款</text>
 								</view>
 							</uni-badge>
 							<uni-badge size="small" :text=count1 absolute="rightTop" type="error">
 							<view class="item" @click="showOrder('1')">
-								<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/send_goods.png" mode=""></image>
+								<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/send_goods.png" mode=""></image>
 								<text class="text">待发货</text>
 							</view>
 							</uni-badge>
 							<uni-badge size="small" :text=count2 absolute="rightTop" type="error">
 							<view class="item" @click="showOrder('2')">
-								<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/sou_goods.png" mode=""></image>
+								<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/sou_goods.png" mode=""></image>
 								<text class="text">待收货</text>
 							</view>
 							</uni-badge>
 							<view class="item" @click="showOrder('3')">
-								<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/completed.png" mode=""></image>
+								<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/completed.png" mode=""></image>
 								<text class="text">已完成</text>
 							</view>
 							<uni-badge size="small" :text=afterSalesCount absolute="rightTop" type="error">
 							<view class="item" @click="navgetTo('/pages_user/user/refundOrderList')">
-								<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/after_sales.png" mode=""></image>
+								<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/after_sales.png" mode=""></image>
 								<text class="text">售后/退款</text>
 							</view>
 							</uni-badge>
@@ -87,53 +87,53 @@
 						<view class="title">常用工具</view>
 						<view class="tools-list">
 							<view class="item" @click="navgetTo('/pages_user/user/address')" v-if="user.isShow==1">
-								<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/address.png" mode=""></image>
+								<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/address.png" mode=""></image>
 								<text class="text">收货地址</text>
 							</view>
-							<view class="item no-marin-bottom" @click="navgetTo('/pages_user/user/integral')">
-								<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/integral.png" mode=""></image>
+							<!-- <view class="item no-marin-bottom" @click="navgetTo('/pages_user/user/integral')">
+								<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/integral.png" mode=""></image>
 								<text class="text">积分管理</text>
-							</view>
+							</view> -->
 							<view class="item no-marin-bottom"  @click="navgetTo('/pages_shopping/shopping/myCoupon')">
-								<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/mycoupon.png" mode=""></image>
+								<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/mycoupon.png" mode=""></image>
 								<text class="text">优惠券</text>
 							</view>
 							<view class="item no-marin-bottom" @click="navgetTo('/pages_user/user/storeProductRelation')">
-								<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/footprint.png" mode=""></image>
+								<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/footprint.png" mode=""></image>
 								<text class="text">我的足迹</text>
 							</view>
-							<view class="item no-marin-bottom" @click="openH5('/h5/userAgreement')">
-								<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/service_file.png" mode=""></image>
+							<view class="item no-marin-bottom" @click="openH5(1)">
+								<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/service_file.png" mode=""></image>
 								<text class="text">用户协议</text>
 							</view>
-							<view class="item no-marin-bottom align-top"  @click="openH5('/h5/privacyPolicy')">
-								<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/advice.png" mode=""></image>
+							<view class="item no-marin-bottom align-top"  @click="openH5(2)">
+								<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/advice.png" mode=""></image>
 								<text class="text">隐私保护</text>
 							</view>
 							<view class="item no-marin-bottom">
-								<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/customer1.png" mode=""></image>
+								<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/customer1.png" mode=""></image>
 								<text class="text">专属客服</text>
 								<button class="contact-btn" open-type="contact"></button>
 							</view>
 							<!-- <view v-if="user.isPromoter==0" class="item no-marin-bottom"  @click="navgetTo('/pages_user/user/userTuiAdd')">
-								<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/my_promotion.png" mode=""></image>
+								<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/my_promotion.png" mode=""></image>
 								<text class="text">申请健康大使</text>
 							</view> -->
 							<!-- <view v-if="user.isPromoter==1" class="item no-marin-bottom"  @click="navgetTo('/pages_user/user/userTui')">
-								<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/my_promotion.png" mode=""></image>
+								<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/my_promotion.png" mode=""></image>
 								<text class="text">我的推广</text>
 							</view> -->
 							<view class="item no-marin-bottom"  @click="navgetTo('/pages/home/cert')">
-								<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/qualification.png" mode=""></image>
+								<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/qualification.png" mode=""></image>
 								<text class="text">资质证书</text>
 							</view>
 	
 							<view class="item no-marin-bottom" @click="toManager()">
-								<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/Document.png" mode=""></image>
+								<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/integral.png" mode=""></image>
 								<text class="text">制单管理</text>
 							</view>
 							 <view class="item no-marin-bottom" @click="toManagerCourse()">
-							 	<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/sale_file.png" mode=""></image>
+							 	<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/sale_file.png" mode=""></image>
 							 	<text class="text">销售管理</text>
 							 </view>
 						</view>
@@ -177,7 +177,7 @@
 					isWeixinAuth:0,
 					phone:"",
 					nickname:"用户昵称",
-					avatarUrl:"https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/detault_head.png"
+					avatarUrl:"https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/detault_head.png"
 				},
 				// 状态栏的高度
 				statusBarHeight: uni.getStorageSync('menuInfo').statusBarHeight,
@@ -268,14 +268,18 @@
 				
 			},
 			openH5(url){
-				var requestPath = uni.getStorageSync('requestPath');
-				uni.setStorageSync('url',requestPath+url);
+				// var requestPath = uni.getStorageSync('requestPath');
+				// uni.setStorageSync('url',requestPath+url);
 				uni.navigateTo({
-					url: '../home/h5'
+					url: '/pages/home/h5?val='+url
 				})
 			},
 			getUserInfo(){
-				getUserInfo().then(
+				const data={
+					appId:wx.getAccountInfoSync().miniProgram.appId,
+				}
+				console.log(data)
+				getUserInfo(data).then(
 					res => {
 						if(res.code==200){
 							if(res.user!=null){
@@ -325,8 +329,8 @@
 		height: 494upx;
 		position: relative;
 		// background-color: #111111;
-		// background-image: url(https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/personl_top_bg.png);
-		background-image: url('https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/personl_top_bg.png');
+		// background-image: url(https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/personl_top_bg.png);
+		background-image: url('https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/personl_top_bg.png');
 		background-repeat: no-repeat;
 		// background-size: 40upx 100%;
 		.top-inner{

pages_company/alipayImg.vue

@@ -97,7 +97,7 @@ page {
  		font-family: PingFang SC;
  		font-weight: 400;
  		color: #FFFFFF;
- 		background:#2BC7B9 !important;
+ 		background:#FC581C !important;
  		border-radius: 44upx;
  	}
  }

pages_company/auth/login.vue

@@ -137,7 +137,7 @@ export default {
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #3BA737;
+				background: #FC581C;
 				border-radius: 44upx;
 			}
 		}

pages_company/card.vue

@@ -99,7 +99,7 @@ page {
  		font-family: PingFang SC;
  		font-weight: 400;
  		color: #FFFFFF;
- 		background:#2BC7B9 !important;
+ 		background:#FC581C !important;
  		border-radius: 44upx;
  	}
  }

pages_company/coupon.vue

@@ -14,7 +14,7 @@
 	</view>
     <view class="tui-coupon-list">
       <view class="tui-coupon-item tui-top20" v-for="(item, index) in couponsList" :key="index">
-         <image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/bg_coupon_3x.png" class="tui-coupon-bg" mode="widthFix"></image>
+         <image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/bg_coupon_3x.png" class="tui-coupon-bg" mode="widthFix"></image>
 		<view class="tui-coupon-item-left">
           <view class="tui-coupon-price-box" :class="{ 'tui-color-grey': item.receiveCount>0 }">
             <view class="tui-coupon-price-sign">￥</view>
@@ -48,7 +48,7 @@
 	<Loading :loaded="loadend" :loading="loading"></Loading>
 	<!--暂无优惠券-->
 	<view v-if="couponsList.length == 0 && page > 1" class="no-data-box" >
-		<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/no_data.png" mode="aspectFit"></image>
+		<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/no_data.png" mode="aspectFit"></image>
 		<view class="empty-title">暂无数据</view>
 	</view>
   </view>
@@ -149,15 +149,15 @@ page {
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #2BC7B9;
-			background: #F5FFFE;
+			color: #FC581C;
+			background: #fff9f5;
 			border: 1px solid #8AD5CE;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #2BC7B9;
-				border: 1px solid #2BC7B9;
+				background: #FC581C;
+				border: 1px solid #FC581C;
 			}
 		}
 	}

pages_company/couponDetails.vue

@@ -2,7 +2,7 @@
   <view class="container">
     <view class="tui-coupon-list">
       <view class="tui-coupon-item tui-top20"  >
-         <image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/bg_coupon_3x.png" class="tui-coupon-bg" mode="widthFix"></image>
+         <image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/bg_coupon_3x.png" class="tui-coupon-bg" mode="widthFix"></image>
 		<view class="tui-coupon-item-left">
           <view class="tui-coupon-price-box"  >
             <view class="tui-coupon-price-sign">￥</view>

pages_company/index.vue

@@ -17,35 +17,35 @@
 				<view class="title">常用工具</view>
 				<view class="tools-list">
 					<view class="item" @click="toCreateOrder()">
-						<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/order.png" mode=""></image>
+						<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/order.png" mode=""></image>
 						<text class="text">商品制单</text>
 					</view>
 					<view class="item" @click="toCreateCoupon()">
-						<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/icon_coupon.png" mode=""></image>
+						<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/icon_coupon.png" mode=""></image>
 						<text class="text">制单优惠券</text>
 					</view>
 					<view class="item" @click="toCreatejin()">
-						<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/xianjin.png" mode=""></image>
+						<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/xianjin.png" mode=""></image>
 						<text class="text">制单立减金</text>
 					</view>
 					<view class="item" @click="toPay()">
-						<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/money.png" mode=""></image>
+						<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/money.png" mode=""></image>
 						<text class="text">微信收款</text>
 					</view>
 					<!-- <view class="item" @click="alipay()">
-						<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/money.png" mode=""></image>
+						<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/money.png" mode=""></image>
 						<text class="text">支付宝收款</text>
 					</view> -->
 					<view class="item" @click="toOrder()">
-						<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/order.png" mode=""></image>
+						<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/order.png" mode=""></image>
 						<text class="text">我的订单</text>
 					</view>
 					<!-- <view class="item" @click="toPackage()">
-						<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/package.png" mode=""></image>
+						<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/package.png" mode=""></image>
 						<text class="text">商品套餐</text>
 					</view>
 					<view class="item" @click="toCoupon()">
-						<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/icon_coupon.png" mode=""></image>
+						<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/icon_coupon.png" mode=""></image>
 						<text class="text">套餐优惠券</text>
 					</view> -->
 					 <view class="item" @click="toPaywechat()">
@@ -53,9 +53,13 @@
 					 	<text class="text">微信收款码</text>
 					 </view>
 					 <view class="item" @click="toliushui()">
-					 	<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/liushui.png" mode=""></image>
+					 	<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/liushui.png" mode=""></image>
 					 	<text class="text">收款流水</text>
 					 </view>
+					 <view class="item" @click="topaylist()" v-if="user.userType=='00'">
+					 	<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/order.png" mode=""></image>
+					 	<text class="text">退款审核</text>
+					 </view>
 				</view>
 			</view>
 			<!-- 退出登录按钮 -->
@@ -81,6 +85,11 @@
 			this.getUserInfo()
 		},
 		methods: {
+			topaylist(){
+				uni.navigateTo({
+					url:'/pages_company/refundList?companyId='+this.user.companyId+"&companyUserId="+this.user.userId
+				})
+			},
 			toCreatejin(){
 				uni.navigateTo({
 					url:'/pages_company/order/DirectDiscount?companyId='+this.user.companyId+"&companyUserId="+this.user.userId
@@ -159,6 +168,7 @@
 					res => {
 						if(res.code==200){
 							  this.user=res.data;
+							  uni.setStorageSync('companyUserType',this.user.userType)
 						}
 						else if(res.code==403){
 							uni.setStorageSync('CompanyUserToken',null);
@@ -261,7 +271,7 @@
 				font-weight: 500;
 				color: #FFFFFF;
 				border-radius: 8rpx;
-				background-color: #2BC7B9;
+				background-color: #FC581C;
 			}
 		}
 		.used-tools{

pages_company/order/DirectDetail.vue

@@ -28,7 +28,7 @@
 	export default {
 		data(){
 			return{
-				imageMap: 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/Direct-sel.png',
+				imageMap: 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/Direct-sel.png',
 				DirectDetail:[],
 				companyUserId:'',
 				companytoken:uni.getStorageSync('CompanyUserToken'),
@@ -148,13 +148,13 @@
 
 <style lang="scss" scoped>
 	.bgmap{
-		background: url('https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/Direct-sel.png');
+		background: url('https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/Direct-sel.png');
 		background-size: cover;
 	}
 	.share-box{
 		width: 120upx;
 		height: 46upx;
-		border: 1px solid #2BC7B9;
+		border: 1px solid #FC581C;
 		border-radius: 23upx;
 		display: flex;
 		align-items: center;

pages_company/order/DirectDiscount.vue

@@ -18,7 +18,7 @@
 			</view>
 		</view>
 		<view v-if="discountlist.length == 0" class="centerV" >
-			<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/no_data.png" mode="aspectFit"></image>
+			<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/no_data.png" mode="aspectFit"></image>
 			<view class="centerV">暂无数据</view>
 		</view>
 	</view>
@@ -32,7 +32,7 @@
 				discountlist:[],
 				companyUserId:"",
 				companyId:"",
-				imageMap: 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/Direct-sel.png',
+				imageMap: 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/Direct-sel.png',
 			}
 		},
 		onLoad(option) {
@@ -71,7 +71,7 @@
 
 <style lang="scss" scoped>
 	.bgmap{
-		background: url('https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/Direct-sel.png');
+		background: url('https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/Direct-sel.png');
 		background-size: cover;
 	}
 </style>

pages_company/order/cart.vue

@@ -10,7 +10,7 @@
 				<view class="info-box">
 					<view>
 						<view class="title-box">
-							<view class="tag">{{utils.getDictLabelName("storeProductType",item.productType)}}</view>
+							<!-- <view class="tag">{{utils.getDictLabelName("storeProductType",item.productType)}}</view> -->
 							<view class="title ellipsis">{{ item.productName }}</view>
 						</view>
 						<view class="intro ellipsis">{{item.productAttrName}}</view>
@@ -22,12 +22,12 @@
 						</view>
 						<view class="num-box">
 							<view class="img-box" @click="delNum(item)">
-								<image v-if="item.cartNum <= 1" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/jian.png" mode=""></image>
-								<image v-else src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/jian2.png" mode=""></image>
+								<image v-if="item.cartNum <= 1" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/jian.png" mode=""></image>
+								<image v-else src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/jian2.png" mode=""></image>
 							</view>
 							<input type="text"  @change="changeNum($event,item)" :value="item.cartNum"   />
 							<view class="img-box" @click="addNum(item)">
-								<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/add.png" mode=""></image>
+								<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/add.png" mode=""></image>
 							</view>
 						</view>
 					</view>
@@ -310,7 +310,7 @@
 							font-family: PingFang SC;
 							font-weight: bold;
 							color: #FFFFFF;
-							background: linear-gradient(90deg, #66b2ef 0%, #2BC7B9 100%);
+							background: linear-gradient(90deg, #ef9266 0%, #FC581C 100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							flex-shrink: 0;
@@ -458,7 +458,7 @@
 					font-family: PingFang SC;
 					font-weight: bold;
 					color: #FFFFFF;
-					background: #2BC7B9;
+					background: #FC581C;
 					border-radius: 44upx;
 				}
 			}

pages_company/order/confirmCompanyOrder.vue

@@ -10,7 +10,8 @@
 					<view class="info-box">
 						<view>
 							<view class="name-box ellipsis2">
-								<view class="tag">{{utils.getDictLabelName("storeProductType",item.productType)}}</view>{{item.productName}}
+								<!-- <view class="tag">{{utils.getDictLabelName("storeProductType",item.productType)}}</view> -->
+								{{item.productName}}
 							</view>
 							<view class="spec ellipsis2">{{item.productAttrName}}</view>
 						</view>
@@ -223,7 +224,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #66b2ef 0%, #2BC7B9 100%);
+							background: linear-gradient(90deg, #ef9266 0%, #FC581C 100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -429,7 +430,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #2BC7B9;
+				background: #FC581C;
 				border-radius: 44upx;
 				position: relative;
 				.share{

pages_company/order/confirmOrder.vue

@@ -10,7 +10,8 @@
 					<view class="info-box">
 						<view>
 							<view class="name-box ellipsis2">
-								<view class="tag">{{utils.getDictLabelName("storeProductType",item.productType)}}</view>{{item.productName}}
+								<!-- <view class="tag">{{utils.getDictLabelName("storeProductType",item.productType)}}</view> -->
+								{{item.productName}}
 							</view>
 							<view class="spec ellipsis2">{{item.productAttrName}}</view>
 						</view>
@@ -50,11 +51,12 @@
 		</view>
 		<view class="message-box" v-if="messageShow">
 			<view class="left">
-				<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/close24.png" mode="" @click="closeOrder()" ></image>
+				<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/close24.png" mode="" @click="closeOrder()" ></image>
 				<view class="text ellipsis">您有{{count0}}个待支付订单</view>
 			</view>
 			<view class="btn" @click="showOrder()">查看</view>
 		</view>
+		<ykscreenRecord></ykscreenRecord>
 	</view>
 </template>
 
@@ -62,7 +64,11 @@
 	import {getOrderCount} from '@/api/storeOrder'
 	import {getDicts} from '@/api/index.js'
 	import {getSalesOrder,addUserCart} from '@/api/companyOrder.js'
+	import {ykscreenRecord} from "@/components/yk-screenRecord/yk-screenRecord.vue"
 	export default {
+		components:{
+			ykscreenRecord
+		},
 		data() {
 			return {
 				count0:0,
@@ -88,6 +94,7 @@
 		},
 		onShow() {
 			this.getSalesOrder()
+			this.getDicts()
 		},
 		methods: {
 			getDicts:function(){
@@ -227,7 +234,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #66b2ef 0%, #2BC7B9 100%);
+							background: linear-gradient(90deg, #ef9266 0%, #FC581C 100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -433,7 +440,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #2BC7B9;
+				background: #FC581C;
 				border-radius: 44upx;
 			}
 		}
@@ -554,7 +561,7 @@
 				font-size: 28upx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #2BC7B9;
+				color: #FC581C;
 			}
 		}
 		.btn{
@@ -567,7 +574,7 @@
 			font-weight: 500;
 			color: #FFFFFF;
 			border: 1px solid #D2E6FF;
-			background: linear-gradient(135deg, #66b2ef 0%, #2BC7B9 100%);
+			background: linear-gradient(135deg, #ef9266 0%, #FC581C 100%);
 			border-radius: 24upx;
 			margin-left: 30upx;
 		}

pages_company/order/coupon.vue

@@ -2,7 +2,7 @@
   <view ref="container">
     <view class="tui-coupon-list">
       <view class="tui-coupon-item tui-top20" v-for="(item, index) in couponsList" :key="index">
-         <image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/bg_coupon_3x.png" class="tui-coupon-bg" mode="widthFix"></image>
+         <image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/bg_coupon_3x.png" class="tui-coupon-bg" mode="widthFix"></image>
 		<view class="tui-coupon-item-left">
           <view class="tui-coupon-price-box" :class="{ 'tui-color-grey': item.receiveCount>0 }">
             <view class="tui-coupon-price-sign">￥</view>
@@ -36,7 +36,7 @@
 	<Loading :loaded="loadend" :loading="loading"></Loading>
 	<!--暂无优惠券-->
 	<view v-if="couponsList.length == 0 && page > 1" class="no-data-box" >
-		<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/no_data.png" mode="aspectFit"></image>
+		<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/no_data.png" mode="aspectFit"></image>
 		<view class="empty-title">暂无数据</view>
 	</view>
   </view>
@@ -123,15 +123,15 @@ page {
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #2BC7B9;
-			background: #F5FFFE;
+			color: #FC581C;
+			background: #fff9f5;
 			border: 1px solid #8AD5CE;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #2BC7B9;
-				border: 1px solid #2BC7B9;
+				background: #FC581C;
+				border: 1px solid #FC581C;
 			}
 		}
 	}

pages_company/order/lineDetails.vue

@@ -26,36 +26,38 @@
 			<view class="justify-start align-center ptb4">
 				<text style="width: 20%;" class="base-color-6">退款记录</text>
 				<view>
-					<view class="base-color-red mb8" v-if="countDeatil.refundAuditStatus==2">
+					<view class="base-color-red mb8" v-if="countDeatil.refundAuditStatus==1">
 						已退款￥{{countDeatil.refundMoney?countDeatil.refundMoney.toFixed(2):'0.00'}}</view>
-					<view class="orangecol" v-if="countDeatil.refundAuditStatus==1">
-						退款中￥{{countDeatil.refundMoney?countDeatil.refundMoney.toFixed(2):'0.00'}}</view>
+					<view class="orangecol" v-if="countDeatil.refundAuditStatus==2">
+						拒绝退款￥{{countDeatil.refundMoney?countDeatil.refundMoney.toFixed(2):'0.00'}}</view>
 					<view class="orangecol" v-if="countDeatil.refundAuditStatus==0">
-						待退款￥{{countDeatil.refundMoney?countDeatil.refundMoney.toFixed(2):'0.00'}}</view>
+						待审核￥{{countDeatil.refundMoney?countDeatil.refundMoney.toFixed(2):'0.00'}}</view>
 					<text>{{countDeatil.refundTime}}</text>
 				</view>
 			</view>
 		</view>
 		<view class="justify-start align-center p20 box mt20">
 			<view class="fs28 mr20" v-if="countDeatil.refundAuditStatus">当前状态</view>
-			<view class="refund" @click="showRefund=true" v-if="countDeatil.refundAuditStatus==null">退款</view>
-			<view class="review" @click="showReview=true" v-if="countDeatil.refundAuditStatus==0">退款审核</view>
-			<view class="refunding" v-if="countDeatil.refundAuditStatus==1">退款中</view>
-			<view class="refuned" v-if="countDeatil.refundAuditStatus==2">已退款</view>
+			<view class="review" @click="showReview=true" v-if="countDeatil.refundAuditStatus==0&&companyUserType=='00'">退款审核</view>
+			<view class="refunding" @click="showReview=true" v-if="countDeatil.refundAuditStatus==0&&companyUserType=='01'">待审核</view>
+			<view class="refuned" v-if="countDeatil.refundAuditStatus==2">拒绝退款</view>
+			<view class="refuned" v-if="countDeatil.refundAuditStatus==1">已退款</view>
+			<view class="refund" @click="showRefund=true" v-if="countDeatil.refundAuditStatus==3" >退款</view>
+			<!-- <view class="refuned" v-if="countDeatil.refundAuditStatus==-1||countDeatil.refundAuditStatus==1">已退款</view> -->
 		</view>
 		<view>
 			<u-modal :show="showRefund" :title="title" :content='content'
 			:showCancelButton="true" @cancel='showRefund=false' @confirm='toRefund'></u-modal>
 		</view>
 		<view>
-			<u-modal :show="showReview" :title="titleReview" :content='contentReview'
-			 :showCancelButton='true' @cancel='showReview=false' @confirm='toReview'></u-modal>
+			<u-modal :show="showReview" :title="titleReview" :content='contentReview' cancelText='拒绝' confirmText='通过'
+			 :showCancelButton='true' @cancel='toReview(2)' @confirm='toReview(1)'></u-modal>
 		</view>
 	</view>
 </template>
 
 <script>
-	import {getPaymentDetail,toReviewRefund,refundStorePayment} from '@/api/payment'
+	import {getPaymentDetail,applyRefund,refundStorePayment,auditRefund} from '@/api/payment'
 	export default {
 		data() {
 			return {
@@ -66,20 +68,23 @@
 				content:'确认退款金额并退款！',
 				titleReview:'审核',
 				contentReview:'确认退款金额并同意当前订单退款！',
-				countDeatil:[]
+				countDeatil:[],
+				companyUserType:null
 			}
 		},
 		onLoad(option) {
 			this.paymentId=option.paymentId
 			this.getPaymentDetails()
 			console.log(this.paymentId)
+			this.companyUserType=uni.getStorageSync('companyUserType')
 		},
 		methods: {
-			toReview(){
+			toReview(type){
 				const data={
-					paymentId:this.paymentId
+					paymentId:this.paymentId,
+					refundStatus:type
 				}
-				toReviewRefund(data).then(res=>{
+				auditRefund(data).then(res=>{
 					if(res.code==200){
 						uni.showToast({
 							icon:'none',
@@ -96,6 +101,37 @@
 				})
 			},
 			toRefund(){
+				if(this.companyUserType=='00'){
+					this.usermanagerefund()
+				}else{
+					this.userRefund()
+				}
+			},
+			userRefund(){
+				const data={
+					paymentId:this.paymentId,
+					refundMoney:this.countDeatil.payMoney
+				}
+				applyRefund(data).then(res=>{
+					if(res.code==200){
+						uni.showToast({
+							icon:'none',
+							title: '操作成功！',
+						});
+						uni.navigateBack({
+							delta:1
+						})
+						this.showRefund=false
+						this.getPaymentDetails()
+					}else{
+						uni.showToast({
+							icon:'none',
+							title: res.msg,
+						});
+					}
+				})
+			},
+			usermanagerefund(){
 				const data={
 					paymentId:this.paymentId,
 					refundMoney:this.countDeatil.payMoney
@@ -106,6 +142,9 @@
 							icon:'none',
 							title: '操作成功！',
 						});
+						uni.navigateBack({
+							delta:1
+						})
 						this.showRefund=false
 						this.getPaymentDetails()
 					}else{

pages_company/order/productDetails.vue

@@ -33,13 +33,14 @@
 				</view>
 			</view>
 			<view class="name-box">
-				<view class="tag">{{utils.getDictLabelName("storeProductType",product.productType)}}</view>{{product.productName}}
+				<!-- <view class="tag">{{utils.getDictLabelName("storeProductType",product.productType)}}</view> -->
+				{{product.productName}}
 			</view>
 			<view class="intro">
 				{{product.productInfo}}
 			</view>
 			<view class="safe-box">
-				<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/safe.png" mode=""></image>
+				<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/safe.png" mode=""></image>
 				<text class="text">免邮发货</text>
 				<view class="line"></view>
 				<!-- <text class="text">服务</text>
@@ -52,7 +53,7 @@
 			<view class="left">
 				<!-- <view class="head-box">
 					<view class="head" v-for="(item,j) in 5" :key="j">
-						<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/head.jpg" mode=""></image>
+						<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/head.jpg" mode=""></image>
 					</view>
 				</view> -->
 				<view class="num-box">
@@ -76,24 +77,24 @@
 		<view class="det-box">
 			<view class="title">图文详情</view>
 			<view class="inner">
-				<view  v-html="product.description" style="font-size:0"></view>
+				<u-parse :content="product.description" :tagStyle="style"></u-parse>
 			</view>
 		</view>
 		<!-- 底部按钮 -->
 		<view class="btn-foot">
 			<view class="menu-box">
 				<view class="item" @click="goHome">
-					<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/back_home.png" mode=""></image>
+					<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/back_home.png" mode=""></image>
 					<text class="label">首页</text>
 				</view>
 				<view class="item" style="position: relative;">
-					<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/consult_small.png" mode=""></image>
+					<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/consult_small.png" mode=""></image>
 					<text class="label">咨询</text>
 					<button class="contact-btn" open-type="contact"></button>
 				</view>
 				<view class="item" @click="navgetTo('./cart')">
 					<uni-badge size="small" :text="cartCount" absolute="rightTop" type="error">
-						<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/cart36.png" mode=""></image>
+						<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/cart36.png" mode=""></image>
 					</uni-badge>
 					<text class="label">购物车</text>
 				</view>
@@ -142,12 +143,12 @@
 					<view class="label">数量</view>
 					<view class="num-box">
 						<view class="img-box" @click="lessNum()">
-							<image v-if="specNum <= 1" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/jian.png" mode=""></image>
-							<image v-else src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/jian2.png" mode=""></image>
+							<image v-if="specNum <= 1" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/jian.png" mode=""></image>
+							<image v-else src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/jian2.png" mode=""></image>
 						</view>
 						<input type="text" @change="changeNum" v-model="specNum"    />
 						<view class="img-box" @click="addNum()">
-							<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/add.png" mode=""></image>
+							<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/add.png" mode=""></image>
 						</view>
 					</view>
 				</view>
@@ -156,10 +157,14 @@
 		</popupBottom>
 	  
 		<view class="loadding" v-if="loadding==true">
-	    	<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logoshare.png"></image>
+	    	<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logoshare.png"></image>
 	    	<text class="text">加载中...</text>
 	    </view>
-	
+		<u-modal :show="showsales" title="温馨提示"  @confirm="hideModals()">
+			<view class="slot-content">
+				<u-parse :content="salesTit"></u-parse>
+			</view>
+		</u-modal>
 	</view>
 </template>
 
@@ -174,6 +179,10 @@
 		},
 		data() {
 			return {
+				style: {
+				  // 字符串的形式
+				  img: "display: block;",
+				},
 				buyText:"立即购买",
 				type:null,
 				productValueSelect:{
@@ -197,6 +206,8 @@
 				// 规格数量
 				specNum: 1,
 				loadding:true,
+				showsales:false,
+				salesTit:''
 			};
 		},
 		onLoad(options) {
@@ -211,6 +222,9 @@
 		},
 		 
 		methods: {
+			hideModals(){
+				this.showsales=false;
+			},
 			getDicts:function(){
 				getDicts().then(
 					res => {
@@ -234,6 +248,7 @@
 					uni.showToast({
 						icon:'none',
 						title: "库存不足",
+						duration: 3000
 					});
 					return;
 				}
@@ -253,14 +268,15 @@
 								uni.showToast({
 									icon:'success',
 									title: "添加成功",
+									duration: 2000
 								});
 							}
 						}else{
-							uni.showToast({
-								icon:'none',
-								title: res.msg,
-							});
-							this.getProductDetails()
+							this.showsales=true
+							this.salesTit=res.msg
+							setTimeout(function(){
+								this.getProductDetails()
+							},1000)
 						}
 					},
 					rej => {}
@@ -296,10 +312,12 @@
 							this.choseSpec(0,0)
 							 
 						}else{
-							uni.showToast({
-								icon:'none',
-								title: res.msg,
-							});
+							// uni.showToast({
+							// 	icon:'none',
+							// 	title: res.msg,
+							// });
+							this.showsales=true
+							this.salesTit=res.msg
 							setTimeout(function(){
 								uni.reLaunch({
 									url: '/pages/home/index',
@@ -445,7 +463,7 @@
 			left: 0;
 			bottom: 0;
 			z-index: 9;
-			background-image: url(https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/black_mask.png);
+			background-image: url(https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/black_mask.png);
 			background-size: 20upx 44upx;
 			background-repeat: repeat-x;
 		}
@@ -510,7 +528,7 @@
 			.share-box{
 				width: 120upx;
 				height: 46upx;
-				border: 1px solid #2BC7B9;
+				border: 1px solid #FC581C;
 				border-radius: 23upx;
 				display: flex;
 				align-items: center;
@@ -520,7 +538,7 @@
 					font-size: 26upx;
 					font-family: PingFang SC;
 					font-weight: 500;
-					color: #2BC7B9;
+					color: #FC581C;
 				}
 				image{
 					margin-left: 2rpx;
@@ -556,7 +574,7 @@
 				display: inline-block;
 				padding: 0 6upx;
 				height: 30upx;
-				background: linear-gradient(90deg, #2BC7B9 0%, #2BC7A4 100%);
+				background: linear-gradient(90deg, #FC581C 0%, #2BC7A4 100%);
 				border-radius: 4upx;
 				margin-right: 10upx;
 				font-size: 22upx;
@@ -761,7 +779,7 @@
 					background: #FF6633;
 				}
 				&.buy{
-					background: #2BC7B9;
+					background: #FC581C;
 				}
 			}
 		}
@@ -854,7 +872,7 @@
 					&.active{
 						background: #F1FFFE;
 						border: 1px solid #8AD5CE;
-						color: #2BC7B9;
+						color: #FC581C;
 					}
 				}
 			}
@@ -911,7 +929,7 @@
 			font-family: PingFang SC;
 			font-weight: bold;
 			color: #FFFFFF;
-			background: #2BC7B9;
+			background: #FC581C;
 			border-radius: 44upx;
 			margin-top: 30upx;
 			// margin-bottom: 30upx;

pages_company/order/productList.vue

@@ -4,13 +4,13 @@
 			<!-- 搜索框 -->
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/search.png" mode=""></image>
 					<input type="text" @confirm="goSearch"   :value="form.productName" placeholder="输入药品名称" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 				<view class="icon-search">
-					<image @click="showChange(2)" v-if="showType==1"  src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/search1.png" mode=""></image>
-					<image @click="showChange(1)" v-if="showType==2"  src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/search2.png" mode=""></image>
-					<image @click="openCart()"   src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/carts.png" mode=""></image>
+					<image @click="showChange(2)" v-if="showType==1"  src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/search1.png" mode=""></image>
+					<image @click="showChange(1)" v-if="showType==2"  src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/search2.png" mode=""></image>
+					<image @click="openCart()"   src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/carts.png" mode=""></image>
 				</view>
 			</view>
 			<!-- 排序框 -->
@@ -21,19 +21,19 @@
 				<view class="item" @click="searchChange('2')">
 					<text class="label">价格</text>
 					<view class="sort-img">
-						<image v-if="form.priceOrder==null||form.priceOrder=='desc'" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/price_arrow_up.png" mode="" @click="priceUp(true)"></image>
-						<image v-if="form.priceOrder=='asc'" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/price_arrow_up2.png" mode="" @click="priceUp(false)"></image>
-						<image v-if="form.priceOrder==null||form.priceOrder=='asc'" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/price_arrow_down.png" mode="" @click="priceDown(true)"></image>
-						<image v-if="form.priceOrder=='desc'" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/price_arrow_down2.png" mode="" @click="priceDown(false)"></image>
+						<image v-if="form.priceOrder==null||form.priceOrder=='desc'" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/price_arrow_up.png" mode="" @click="priceUp(true)"></image>
+						<image v-if="form.priceOrder=='asc'" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/price_arrow_up2.png" mode="" @click="priceUp(false)"></image>
+						<image v-if="form.priceOrder==null||form.priceOrder=='asc'" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/price_arrow_down.png" mode="" @click="priceDown(true)"></image>
+						<image v-if="form.priceOrder=='desc'" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/price_arrow_down2.png" mode="" @click="priceDown(false)"></image>
 					</view>
 				</view>
 				<view class="item" @click="searchChange('3')">
 					<text class="label">销量</text>
 					<view class="sort-img">
-						<image v-if="form.salesOrder==null||form.salesOrder=='desc'" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/price_arrow_up.png" mode="" @click="saleUp(true)"></image>
-						<image v-if="form.salesOrder=='asc'" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/price_arrow_up2.png" mode="" @click="saleUp(false)"></image>
-						<image v-if="form.salesOrder==null||form.salesOrder=='asc'" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/price_arrow_down.png" mode="" @click="saleDown(true)"></image>
-						<image v-if="form.salesOrder=='desc'" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/price_arrow_down2.png" mode="" @click="saleDown(false)"></image>
+						<image v-if="form.salesOrder==null||form.salesOrder=='desc'" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/price_arrow_up.png" mode="" @click="saleUp(true)"></image>
+						<image v-if="form.salesOrder=='asc'" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/price_arrow_up2.png" mode="" @click="saleUp(false)"></image>
+						<image v-if="form.salesOrder==null||form.salesOrder=='asc'" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/price_arrow_down.png" mode="" @click="saleDown(true)"></image>
+						<image v-if="form.salesOrder=='desc'" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/price_arrow_down2.png" mode="" @click="saleDown(false)"></image>
 					</view>
 				</view>
 				<view class="item" :class="form.newOrder=='desc'?'active':''" @click="searchChange('4')">
@@ -51,14 +51,14 @@
 					</view>
 					<view class="info-box">
 						<view class="title ellipsis2">{{item.productName}}</view>
-						<view class="intro ellipsis">{{item.productInfo}}</view>
+						<view class="intro ellipsis">{{item.productInfo||''}}</view>
 						<view class="prce-num">
 							<view class="price">
 								<text class="unit">¥</text>
 								<text class="num">{{item.price.toFixed(2)}} </text>
 							</view>
 							<view class="cart-img" @click="navgetTo('../shopping/cart')">
-								<view class="sale">已售 {{item.sales}} {{item.unitName}}</view>
+								<view class="sale">已售 {{item.sales}} {{item.unitName||''}}</view>
 							</view>
 						</view>
 					</view>
@@ -112,7 +112,7 @@
 					},
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					empty: {
-						icon:'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/no_data.png',
+						icon:'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/no_data.png',
 						tip: '暂无数据'
 					},
 					textNoMore:"已经到底了",
@@ -310,7 +310,7 @@
 			align-items: center;
 			justify-content: center;
 			&.active .label{
-				color: #2BC7B9;
+				color: #FC581C;
 			}
 			.label{
 				font-size: 26upx;

pages_company/order/productShowDetails.vue

@@ -34,13 +34,14 @@
 				</view>
 			</view>
 			<view class="name-box">
-				<view class="tag">{{utils.getDictLabelName("storeProductType",product.productType)}}</view>{{product.productName}}
+				<!-- <view class="tag">{{utils.getDictLabelName("storeProductType",product.productType)}}</view> -->
+				{{product.productName}}
 			</view>
 			<view class="intro">
 				{{product.productInfo}}
 			</view>
 			<view class="safe-box">
-				<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/safe.png" mode=""></image>
+				<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/safe.png" mode=""></image>
 				<text class="text">免邮发货</text>
 				<view class="line"></view>
 				<!-- <text class="text">药师服务</text>
@@ -53,7 +54,7 @@
 			<view class="left">
 				<!-- <view class="head-box">
 					<view class="head" v-for="(item,j) in 5" :key="j">
-						<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/head.jpg" mode=""></image>
+						<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/head.jpg" mode=""></image>
 					</view>
 				</view> -->
 				<view class="num-box">
@@ -82,7 +83,7 @@
 		</view>
 		
 		<view class="loadding" v-if="loadding==true">
-			<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/image/logoshare.png"></image>
+			<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/image/logoshare.png"></image>
 			<text class="text">加载中...</text>
 		</view>
 		
@@ -199,7 +200,7 @@
 			left: 0;
 			bottom: 0;
 			z-index: 9;
-			background-image: url(https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/black_mask.png);
+			background-image: url(https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/black_mask.png);
 			background-size: 20upx 44upx;
 			background-repeat: repeat-x;
 		}
@@ -264,7 +265,7 @@
 			.share-box{
 				width: 120upx;
 				height: 46upx;
-				border: 1px solid #2BC7B9;
+				border: 1px solid #FC581C;
 				border-radius: 23upx;
 				display: flex;
 				align-items: center;
@@ -274,7 +275,7 @@
 					font-size: 26upx;
 					font-family: PingFang SC;
 					font-weight: 500;
-					color: #2BC7B9;
+					color: #FC581C;
 				}
 				image{
 					margin-left: 2rpx;
@@ -310,7 +311,7 @@
 				display: inline-block;
 				padding: 0 6upx;
 				height: 30upx;
-				background: linear-gradient(90deg, #66b2ef 0%, #2BC7B9 100%);
+				background: linear-gradient(90deg, #ef9266 0%, #FC581C 100%);
 				border-radius: 4upx;
 				margin-right: 10upx;
 				font-size: 22upx;

pages_company/paymentStatistics.vue

@@ -35,19 +35,19 @@
 				@refresherrestore="triggered = false" :upper-threshold="100" :lower-threshold="100"
 				@refresherabort="triggered = false" @scrolltolower="reachBottom">
 				<view class="bgf p40 m4 " v-for="(item,index) in paymentList" :key="index">
-					<!-- <view class="justify-between align-center" @click="tolineDetails(item)"> -->
-						<view class="justify-between align-center">
-						<view>
-							<view class="fs28 base-color-6 mt4" v-if="item.remark">备注：{{item.remark}}</view>
-							<view class="fs24 base-color-9">支付时间：{{item.payTime}}</view>
-						</view>
-						<view class="column centerV">
-							<view class="base-success fs40 bold">{{item.payMoney.toFixed(2)}}</view>
-							<!-- <view class="orangecol fs24" v-if="item.refundAuditStatus==0&&item.refundAuditStatus==1"
-							>{{item.refundAuditStatus==0?'待审核':'退款中'}}</view>
-							<view class="base-price fs24" v-if="item.refundAuditStatus==2"
-							>{{item.refundAuditStatus==2?'已退款':''}}</view> -->
-						</view>
+					<view class="justify-between align-center" @click="tolineDetails(item)">
+						<!-- <view class="justify-between align-center"> -->
+							<view>
+								<view class="fs28 base-color-6 mt4" v-if="item.remark">备注：{{item.remark}}</view>
+								<view class="fs24 base-color-9">支付时间：{{item.payTime}}</view>
+							</view>
+							<view class="column centerV">
+								<view class="base-success fs40 bold">{{item.payMoney.toFixed(2)}}</view>
+								<view class="base-price fs24" v-if="item.refundAuditStatus==1">已退款</view>
+								<view class="base-price fs24" v-if="item.refundAuditStatus==0">待审核</view>
+								<view class="orangecol fs24" v-else-if="item.refundAuditStatus==2">拒绝退款</view>
+							</view>
+						<!-- </view> -->
 					</view>
 				</view>
 				<u-loadmore :status="status" />
@@ -98,6 +98,10 @@
 			this.getlistDiscount()
 			this.getPaymentDatas("refresh")
 		},
+		onshow(){
+			this.getlistDiscount()
+			this.getPaymentDatas("refresh")
+		},
 		methods:{
 			tolineDetails(item){
 				uni.navigateTo({
@@ -110,7 +114,8 @@
 					statType:this.queryParam.type,
 					startDate:this.startTime,
 					endDate:this.endTime,
-					companyId:this.companyId
+					companyId:this.companyId,
+					appId:wx.getAccountInfoSync().miniProgram.appId
 				}
 				getPaymentData(data).then(res=>{
 					if(res.code==200){
@@ -179,7 +184,8 @@
 					startDate:this.startTime,
 					endDate:this.endTime,
 					pageSize:this.pageSize,
-					pageNum:this.pageNum
+					pageNum:this.pageNum,
+					appId:wx.getAccountInfoSync().miniProgram.appId
 					}
 				getPaymentList(data).then(res=>{
 					if(res.code==200){

pages_company/refundList.vue

@@ -0,0 +1,334 @@
+<template>
+	<view class="column hb flex-1" >
+		<view class="searchbox">
+			<view class="searchbox-bar x-ac">
+				<view :class="queryParam.type == index ? 'searchbox-item searchbox-active':'searchbox-item'"
+					v-for="(item,index) in typeOption" :key="index" @click="handleType(index)">{{item.label}}</view>
+			</view>
+			<view class="x-ac ss mt20" v-show="queryParam.type == 4">
+				<view class="calendar-day x-c" @click="showCalendar = true"><u-icon name="calendar" color="#999"
+						size="20"></u-icon>{{startTime}}</view>
+				<view class="calendar-day x-c" @click="showCalendar = true"><u-icon name="calendar" color="#999"
+						size="20"></u-icon>{{endTime}}</view>
+			</view>
+		</view>
+		<view >
+			<u-calendar :show="showCalendar" :mode="mode" @confirm="confirmCalendar" style="flex: 0; overflow: hidden;"
+				@close="closeCalendar" :minDate="new Date().getTime()-(3600*1000*24*60)" :maxDate="new Date().getTime()"
+				></u-calendar>
+		</view>
+		<view class="justify-between p40 align-center">
+			<view>{{PaymentData.statPeriod}}</view>
+			<view class='base-color-6 fs24'>
+				<text class="base-color-dark fs32">{{queryParam.type != 4?'已退款':'拒绝退款'}}{{PaymentData.count}}</text>笔
+			</view>
+			<!-- <view>
+				<view class='fs28 base-color-6'>已退款:
+					<text class="base-success">￥{{PaymentData.count?PaymentData.count:'0.00'}}</text></view>
+			</view> -->
+		</view>
+		<view class="column scrolly">
+			<scroll-view :scroll-y="true" class="hb pb40" :refresher-enabled="isEnabled" :refresher-triggered="triggered"
+				refresher-background="rgba(0,0,0,0)" @refresherrefresh="pullDownRefresh"
+				@refresherrestore="triggered = false" :upper-threshold="100" :lower-threshold="100"
+				@refresherabort="triggered = false" @scrolltolower="reachBottom">
+				<view class="bgf p40 m4 " v-for="(item,index) in paymentList" :key="index">
+					<view class="justify-between align-center" @click="tolineDetails(item)">
+						<!-- <view class="justify-between align-center"> -->
+							<view>
+								<view class="fs28 base-color-6 mt4" v-if="item.remark">备注：{{item.remark}}</view>
+								<view class="fs24 base-color-9">支付时间：{{item.payTime}}</view>
+							</view>
+							<view class="column centerV">
+								<view class="base-success fs40 bold">{{item.payMoney.toFixed(2)}}</view>
+								<view class="base-price fs24" v-if="item.refundAuditStatus==1">已退款</view>
+								<view class="orangecol fs24" v-if="item.refundAuditStatus==0" @click="topaymentId(item.paymentId)">待审核</view>
+								<view class="base-price fs24" v-else-if="item.refundAuditStatus==2">拒绝退款</view>
+							</view>
+						<!-- </view> -->
+					</view>
+				</view>
+				<u-loadmore :status="status" />
+				<view class="pb120" v-if="queryParam.type==1"></view>
+			</scroll-view>
+		</view>
+		<view>
+			<u-modal :show="showReview" :title="titleReview" :content='contentReview' cancelText='拒绝' confirmText='通过'
+			 :showCancelButton='true' @cancel='toReview(2)' @confirm='toReview(1)'></u-modal>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {getPendingRefundList,getRefundAuditCount,auditRefund } from '@/api/payment'
+	export default {
+		data() {
+			return {
+				typeOption: [{
+					label: '全部',
+					value: 0
+				}, {
+					label: '待审核',
+					value: 1
+				}, {
+					label: '已审核',
+					value: 2
+				}, {
+					label: '已拒绝',
+					value: 4
+				}],
+				queryParam: {
+					type: 0
+				},
+				showCalendar:false,
+				mode: 'range',
+				startTime:uni.$u.timeFormat(new Date(), 'yyyy-mm-dd'),
+				endTime:uni.$u.timeFormat(new Date(), 'yyyy-mm-dd'),
+				companyId:'',
+				companyUserId:'',
+				pageSize:10,
+				pageNum:1,
+				triggered: false,
+				status: 'loadmore',
+				isEnabled: true,
+				paymentList:[],
+				PaymentData:[],
+				selectedUsers:[],
+				isSelectAll:false,
+				titleReview:'审核',
+				contentReview:'确认退款金额并同意当前订单退款！',
+				showReview:false,
+				getpaymentId:null
+			}
+		},
+		onLoad(option) {
+			this.companyUserId=option.companyUserId
+			this.companyId=option.companyId
+			this.getlistDiscount()
+			this.getPaymentDatas("refresh")
+		},
+		methods:{
+			// 全选
+			selectAll() {
+				this.isSelectAll = !this.isSelectAll;
+				this.selectedUsers = []; // 清空已选列表
+				 // 遍历所有用户项，更新 checked 状态
+				    this.paymentList = this.paymentList.map(group => {
+				      // group = group.map(user => {
+				        if (this.isSelectAll) {
+				          this.selectedUsers.push(group.paymentId); // 添加用户ID到选中列表
+				        }
+				        return {
+				          ...group,
+				          checked: this.isSelectAll,
+				        };
+				      // });
+				      return group;
+				    });
+				// 如果取消全选，清空 selectedUsers
+					if (!this.isSelectAll) {
+					  this.selectedUsers = [];
+					}
+			},
+			// 单选 /反选
+			changeitem(paymentId) {
+				const index = this.selectedUsers.indexOf(paymentId);
+				if (index === -1) {
+				  this.selectedUsers.push(paymentId); // 选中
+				} else {
+				  this.selectedUsers.splice(index, 1); // 取消选中
+				}
+				// 更新全选状态
+				this.isSelectAll = this.selectedUsers.length === this.getTotalUsers();
+			},
+			// 计算总用户数
+			  getTotalUsers() {
+			    return this.paymentList.reduce((total, group) => total + group.length, 0);
+			  },
+			tolineDetails(item){
+				uni.navigateTo({
+					url:'/pages_company/order/lineDetails?paymentId='+item.paymentId
+				})
+			},
+			paymentId(id){
+				this.getpaymentId=id
+			},
+			toReview(type){
+				if(this.queryParam.type!=1){
+					this.selectedUsers[0]=this.getpaymentId
+				}else{
+					
+				}
+				const data={
+					paymentId:this.getpaymentId,
+					refundStatus:type
+				}
+				auditRefund(data).then(res=>{
+					if(res.code==200){
+						uni.showToast({
+							icon:'none',
+							title: '操作成功！',
+						});
+						this.showReview=false
+						this.getlistDiscount('refresh')
+					}else{
+						uni.showToast({
+							icon:'none',
+							title: res.msg,
+						});
+					}
+				})
+			},
+			getPaymentDatas(){
+				const data={
+					companyUserId:this.companyUserId,
+					auditStatus:this.queryParam.type,
+					// startDate:this.startTime,
+					// endDate:this.endTime,
+					companyId:this.companyId,
+					appId:wx.getAccountInfoSync().miniProgram.appId
+				}
+				getRefundAuditCount(data).then(res=>{
+					if(res.code==200){
+						this.PaymentData=res.data
+					}else{
+						uni.showToast({
+							icon:'none',
+							title: res.msg,
+						});
+					}
+				})
+			},
+			handleType(type) {
+				this.queryParam.type = type
+				// if(this.queryParam.type != 4){
+					this.pageNum=1
+					this.paymentList=[]
+					this.getlistDiscount()
+					this.getPaymentDatas("refresh")
+				// }
+				// if (this.queryParam.type == 4) {
+				// }
+			},
+			confirmCalendar(e) {
+				this.startTime = e[0]
+				this.endTime = e[e.length - 1]
+				this.paymentList=[]
+				this.getlistDiscount()
+				this.getPaymentDatas("refresh")
+				this.showCalendar = false
+			},
+			closeCalendar() {
+				this.showCalendar = false
+			},
+			pullDownRefresh() {
+				// 下拉刷新
+				this.triggered = true; //下拉了状态为true
+				setTimeout(() => {
+					this.triggered = false;
+					uni.stopPullDownRefresh()
+					this.pageNum = 1;
+					this.paymentList=[]
+					this.getlistDiscount('refresh') //触底  不穿执行else
+					// 请求接口里面需要判断是不是最后一页   是最后一页 status赋值为‘loadmore’没有更多了
+					// 请求接口
+				}, 1000)
+			},
+			reachBottom() {
+				// status这个是加载状态
+				console.log(111);
+				if (this.status === 'loadmore') {
+					this.status = 'loading'
+					uni.showNavigationBarLoading()
+					setTimeout(() => {
+						this.pageNum++
+						this.getlistDiscount() //触底  不穿执行else
+						uni.hideNavigationBarLoading()
+					}, 1000);
+				}
+			},
+			getlistDiscount(type){
+				const data={
+					companyUserId:this.companyUserId,
+					companyId:this.companyId,
+					auditStatus:this.queryParam.type,
+					// startDate:this.startTime,
+					// endDate:this.endTime,
+					pageSize:this.pageSize,
+					pageNum:this.pageNum,
+					appId:wx.getAccountInfoSync().miniProgram.appId
+					}
+				getPendingRefundList(data).then(res=>{
+					if(res.code==200){
+						// refresh 下拉
+						// let list=res.data.list
+						let list = res.data.list.map(item => {
+							return {
+								...item,
+								checked: false,
+							}
+						})
+						if (type == 'refresh') {
+							this.paymentList = list
+							
+						} else {
+							// 加载更多 当前页和下一页合并
+							this.paymentList = [...this.paymentList, ...list]
+						}
+						if (res.data.isLastPage) {
+							this.status = 'nomore'
+						} else {
+							this.status = 'loadmore'
+						}
+					}else{
+						uni.showToast({
+							icon:'none',
+							title: res.msg,
+						});
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.foot-select {
+		width:100%;
+		padding: 20rpx 20rpx;
+		padding-bottom: 60rpx;
+		z-index: 10000 !important;
+		position: fixed;
+		bottom: 0;
+	}
+	.orangecol{
+		background-color: #ffa006;
+		color: #fff;
+		border-radius: 40rpx;
+		padding: 10rpx 20rpx;
+		text-align: center;
+	}
+	.searchbox {
+		background-color: #fff;
+		border-radius: 8rpx 8rpx 0 0;
+		padding: 15px;
+	
+		&-item {
+			height: 23px;
+			line-height: 23px;
+			width: 65px;
+			background: #f5f5f5;
+			text-align: center;
+			border-radius: 5px;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 400;
+			font-size: 12px;
+			color: #888;
+		}
+	
+		&-active {
+			color: #fff !important;
+			background-color: #1677ff !important;
+		}
+	}
+</style>

pages_company/storeOrder.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="search-cont">
 			<view class="inner">
-				<image class="icon-search" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/search.png" mode=""></image>
+				<image class="icon-search" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/search.png" mode=""></image>
 				<input type="text" value="" placeholder="输入订单号" confirm-type="搜索" @confirm="goSearch"   placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 			</view>
 		</view>
@@ -83,7 +83,7 @@
 					},
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					empty: {
-						icon:'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/no_data.png',
+						icon:'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/no_data.png',
 						tip: '暂无数据'
 					}
 				},
@@ -251,7 +251,7 @@
 						font-family: PingFang SC;
 						font-weight: 500;
 						color: #FFFFFF;
-						background-image: url(https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/recom.png);
+						background-image: url(https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/recom.png);
 						background-repeat: no-repeat;
 						background-size: 100% 100%;
 						margin-right: 8upx;
@@ -262,7 +262,7 @@
 						font-weight: 500;
 						line-height: 1;
 						&.success{
-							color: #2BC7B9;
+							color: #FC581C;
 						}
 						&.black{
 							color: #111111;
@@ -305,7 +305,7 @@
 								display: inline-block;
 								padding: 0 6upx;
 								height: 30upx;
-								background: linear-gradient(90deg, #66b2ef 0%, #2BC7B9 100%);
+								background: linear-gradient(90deg, #ef9266 0%, #FC581C 100%);
 								border-radius: 4upx;
 								margin-right: 10upx;
 								font-size: 22upx;
@@ -415,7 +415,7 @@
 								color: #666666;
 							}
 							&.pay{
-								background: #2BC7B9;
+								background: #FC581C;
 								color: #FFFFFF;
 								position: relative;
 								.share{

pages_company/storeOrderDetail.vue

@@ -2,13 +2,13 @@
 	<view>
 		<view class="top-cont">
 			<!-- 背景图片 -->
-			<image class="bg" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/order_top_bg.png" mode=""></image>
+			<image class="bg" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/order_top_bg.png" mode=""></image>
 			<view class="top-inner">			
 				<!-- 这里是状态栏 -->
 				<view class="fixed-top-box">
 					<view class="status_bar" :style="{height: statusBarHeight}"></view>
 					<view class="back-box" @click="back">
-						<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/back_white.png" mode=""></image>
+						<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/back_white.png" mode=""></image>
 						<text class="title">订单详情</text>
 						<text></text>
 					</view>
@@ -23,7 +23,7 @@
 					<!-- 待付款 -->
 					<view v-if="order.status == 0" class="inner">
 						<view class="img-box">
-							<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/pag96.png" mode=""></image>
+							<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/pag96.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">待付款</text>
@@ -33,7 +33,7 @@
 					<!-- 待发货 -->
 					<view v-if="order.status == 1" class="inner">
 						<view class="img-box">
-							<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/pag96.png" mode=""></image>
+							<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/pag96.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">待发货</text>
@@ -43,7 +43,7 @@
 					<!-- 已发货、待收货 -->
 					<view v-if="order.status == 2" class="inner">
 						<view class="img-box">
-							<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/receipt.png" mode=""></image>
+							<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/receipt.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">待收货</text>
@@ -53,7 +53,7 @@
 					<!-- 已完成 -->
 					<view v-if="order.status == 3" class="inner">
 						<view class="img-box">
-							<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/finish96.png" mode=""></image>
+							<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/finish96.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">已完成</text>
@@ -64,7 +64,7 @@
 					<!--交易取消 -->
 					<view v-if="order.status == -3" class="inner">
 						<view class="img-box">
-							<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/close_trade.png" mode=""></image>
+							<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/close_trade.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">交易关闭</text>
@@ -73,7 +73,7 @@
 					</view>
 					<view v-if="order.status == -1" class="inner">
 						<view class="img-box">
-							<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/close_trade.png" mode=""></image>
+							<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/close_trade.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">申请售后</text>
@@ -82,7 +82,7 @@
 					</view>
 					<view v-if="order.status == -2" class="inner">
 						<view class="img-box">
-							<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/close_trade.png" mode=""></image>
+							<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/close_trade.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">退款成功</text>
@@ -93,7 +93,7 @@
 				<!-- 下单人信息 -->
 				<view class="order-placer">
 					<view class="inner">
-						<image class="location" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/location.png" mode=""></image>
+						<image class="location" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/location.png" mode=""></image>
 						<view class="info">
 							<view class="name-phone">
 								<text class="text">{{order.realName}}</text>
@@ -206,7 +206,7 @@
 							<text class="label">电子处方</text>
 							<view class="check-box" @click="showImg()">
 								<text class="text">查看</text>
-								<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/arrow4.png" mode=""></image>
+								<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/arrow4.png" mode=""></image>
 							</view>
 						</view>
 					</view>
@@ -373,7 +373,7 @@
 <style lang="scss">
 	.fixed-top-box{
 		width: 100%;
-		background: linear-gradient(135deg, #66b2ef 0%, #2BC7B9 100%);
+		background: linear-gradient(135deg, #ef9266 0%, #FC581C 100%);
 		position: fixed;
 		top: 0;
 		left: 0;
@@ -541,7 +541,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #66b2ef 0%, #2BC7B9 100%);
+							background: linear-gradient(90deg, #ef9266 0%, #FC581C 100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -732,7 +732,7 @@
 			border-radius: 32upx;
 			margin-left: 15upx;
 			&.share-btn{
-				background: #2BC7B9;
+				background: #FC581C;
 				color: #FFFFFF;
 				position: relative;
 				.share{
@@ -833,7 +833,7 @@
 					font-family: PingFang SC;
 					font-weight: bold;
 					color: #FFFFFF;
-					background: #2BC7B9;
+					background: #FC581C;
 					border-radius: 44upx;
 				}
 			}

pages_company/storeProductPackage.vue

@@ -3,7 +3,7 @@
 		<view class="top-fixed">
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/search.png" mode=""></image>
 					<input type="text" @confirm="goSearch"   :value="form.title" placeholder="输入套餐名称" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 			</view>
@@ -93,7 +93,7 @@
 					},
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					empty: {
-						icon:'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/no_data.png',
+						icon:'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/no_data.png',
 						tip: '暂无数据'
 					}
 				},
@@ -238,15 +238,15 @@
 				font-size: 28upx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #2BC7B9;
-				background: #F5FFFE;
+				color: #FC581C;
+				background: #fff9f5;
 				border: 1px solid #8AD5CE;
 				border-radius: 32upx;
 				margin: 0 20upx 20upx 0;
 				&.active{
 					color: #FFFFFF;
-					background: #2BC7B9;
-					border: 1px solid #2BC7B9;
+					background: #FC581C;
+					border: 1px solid #FC581C;
 				}
 			}
 		}
@@ -291,7 +291,7 @@
 						font-family: PingFang SC;
 						font-weight: 500;
 						color: #FFFFFF;
-						background-image: url(https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/recom.png);
+						background-image: url(https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/recom.png);
 						background-repeat: no-repeat;
 						background-size: 100% 100%;
 						margin-right: 8upx;
@@ -302,7 +302,7 @@
 						font-weight: 500;
 						line-height: 1;
 						&.success{
-							color: #2BC7B9;
+							color: #FC581C;
 						}
 						&.black{
 							color: #111111;
@@ -346,7 +346,7 @@
 								display: inline-block;
 								padding: 0 6upx;
 								height: 30upx;
-								background: linear-gradient(90deg, #66b2ef 0%, #2BC7B9 100%);
+								background: linear-gradient(90deg, #ef9266 0%, #FC581C 100%);
 								border-radius: 4upx;
 								margin-right: 10upx;
 								font-size: 22upx;
@@ -471,7 +471,7 @@
 								color: #666666;
 							}
 							&.pay{
-								background: #2BC7B9;
+								background: #FC581C;
 								color: #FFFFFF;
 								position: relative;
 								.share{

pages_company/storeProductPackageDetails.vue

@@ -80,11 +80,11 @@
 		<view class="btn-foot">
 			<view class="menu-box">
 				<view class="item" @click="goHome">
-					<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/back_home.png" mode=""></image>
+					<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/back_home.png" mode=""></image>
 					<text class="label">首页</text>
 				</view>
 				<view class="item" style="position: relative;">
-					<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/consult_small.png" mode=""></image>
+					<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/consult_small.png" mode=""></image>
 					<text class="label">咨询</text>
 					<button class="contact-btn" open-type="contact"></button>
 				</view>
@@ -96,7 +96,7 @@
 		</view>
 		<view class="message-box" v-if="messageShow">
 			<view class="left">
-				<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/close24.png" mode="" @click="closeOrder()" ></image>
+				<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/close24.png" mode="" @click="closeOrder()" ></image>
 				<view class="text ellipsis">您有{{count0}}个待支付订单</view>
 			</view>
 			<view class="btn" @click="showOrder()">查看</view>
@@ -284,7 +284,7 @@
 			left: 0;
 			bottom: 0;
 			z-index: 9;
-			background-image: url(https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/black_mask.png);
+			background-image: url(https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/black_mask.png);
 			background-size: 20upx 44upx;
 			background-repeat: repeat-x;
 		}
@@ -349,7 +349,7 @@
 			.share-box{
 				width: 120upx;
 				height: 46upx;
-				border: 1px solid #2BC7B9;
+				border: 1px solid #FC581C;
 				border-radius: 23upx;
 				display: flex;
 				align-items: center;
@@ -359,7 +359,7 @@
 					font-size: 26upx;
 					font-family: PingFang SC;
 					font-weight: 500;
-					color: #2BC7B9;
+					color: #FC581C;
 				}
 				image{
 					margin-left: 2rpx;
@@ -395,7 +395,7 @@
 				display: inline-block;
 				padding: 0 6upx;
 				height: 30upx;
-				background: linear-gradient(90deg, #66b2ef 0%, #2BC7B9 100%);
+				background: linear-gradient(90deg, #ef9266 0%, #FC581C 100%);
 				border-radius: 4upx;
 				margin-right: 10upx;
 				font-size: 22upx;
@@ -600,7 +600,7 @@
 					background: #FF6633;
 				}
 				&.buy{
-					background: #2BC7B9;
+					background: #FC581C;
 				}
 			}
 		}
@@ -693,7 +693,7 @@
 					&.active{
 						background: #F1FFFE;
 						border: 1px solid #8AD5CE;
-						color: #2BC7B9;
+						color: #FC581C;
 					}
 				}
 			}
@@ -750,7 +750,7 @@
 			font-family: PingFang SC;
 			font-weight: bold;
 			color: #FFFFFF;
-			background: #2BC7B9;
+			background: #FC581C;
 			border-radius: 44upx;
 			margin-top: 30upx;
 			// margin-bottom: 30upx;
@@ -803,7 +803,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #66b2ef 0%, #2BC7B9 100%);
+							background: linear-gradient(90deg, #ef9266 0%, #FC581C 100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -891,7 +891,7 @@
 				font-size: 28upx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #2BC7B9;
+				color: #FC581C;
 			}
 		}
 		.btn{
@@ -904,7 +904,7 @@
 			font-weight: 500;
 			color: #FFFFFF;
 			border: 1px solid #D2E6FF;
-			background: linear-gradient(135deg, #66b2ef 0%, #2BC7B9 100%);
+			background: linear-gradient(135deg, #ef9266 0%, #FC581C 100%);
 			border-radius: 24upx;
 			margin-left: 30upx;
 		}

pages_company/wechatcode.vue

@@ -3,7 +3,7 @@
 		<view class="codeimg">
 			<view v-if="wechatImg!=null" class="centerV">
 				<image :src="wechatImg" style="width: 100%;" mode="aspectFit" :show-menu-by-longpress="true" ></image>
-				<view class="centerV">点击保存图片至本地！</view>
+				<view class="centerV">点击保存或长按图片保存至本地！</view>
 			</view>
 			<view v-else>
 				<image src="https://zkzh-2025.oss-cn-beijing.aliyuncs.com/shop/images/no_data.png" style="width: 100%;"
@@ -116,7 +116,7 @@
 	}
 
 	.generate {
-		background-color: #2BC7B9;
+		background-color: #FC581C;
 		width: 70%;
 		margin: 0 auto;
 		border-radius: 40rpx;

pages_course/becomeVIP.vue

@@ -14,7 +14,7 @@
 		<view class="base-bg-orange colorf ptb20 plr40 radius60" 
 		v-if="(userInfos==null||userInfos=='')&&imgname=='乐氏本源'" @click="nato()">授权用户信息</view>
 		<view class="btns" v-else>
-			<button
+			<!-- <button
 				class="author-btn"
 				open-type="getUserInfo"
 				:disabled="userdisabled"
@@ -23,8 +23,8 @@
 				v-else
 				class="author-btn"
 				open-type="getPhoneNumber"
-				@getphonenumber="phoneLogin"  >{{isVip==1?'您已成为会员':'申请成为会员'}}</button>
-			<button class="author-btn" v-if="isVip==1 || isbecomevip==1" @click="handleAgree()">{{viptext}}</button>
+				@getphonenumber="phoneLogin"  >{{isVip==1?'您已成为会员':'申请成为会员'}}</button> -->
+			<button class="author-btn"  @click="handleAgree()">{{viptext}}</button>
 		</view>
 		
 		<!--#endif-->
@@ -81,12 +81,16 @@
 			</view>
 		</u-popup>
 		<!--#endif-->
-		<view class="footer-tips">重庆云联融智提供技术支持</view>
+		<!-- <view class="footer-tips">重庆云联融智提供技术支持</view> -->
 	</view>
 </template>
 
 <script>
-	import { loginByMp,registerCourses,loginByMiniApp,checkUserInfo,editUser} from '@/api/courseLook'
+	import { loginByMp,registerCourses,loginByMiniApp,handleFsUserWx} from '@/api/courseLook'
+	import { mapGetters } from 'vuex';
+	import {
+		getConfigByKey
+	} from "@/api/user.js"
 	export default {
 		data() {
 			return {
@@ -99,7 +103,6 @@
 				tagIds:[],
 				isbecomevip:0,
 				viptext:'申请成为会员',
-				userInfos:null,
 				userlogo:false,
 				userinfos:{
 					nickname:'',
@@ -108,7 +111,9 @@
 				headImg:'',
 				authType:0,//0微信登录 1手机号登录
 				userdisabled:false,
-				projectId:''
+				projectId:'',
+				H5course:{},
+				miniAppAuthType:2
 			}
 		},
 		computed: {
@@ -127,23 +132,38 @@
 			avataruser() {
 				return this.userinfos.avatar
 			},
+			...mapGetters(['coureLogin']),
+		},
+		watch: {
+		    coureLogin: {
+		      immediate: true,          // 页面一进入就检查一次
+		      handler(val) {
+		        if (val == 2&&this.isLogin) {
+					console.log("看课AppToken失效，请重新登录")
+					this.isLogin = false
+					if(this.miniAppAuthType==2){
+						this.goLogin()
+					}else{
+						this.goLogins()
+					}
+		        }
+		      }
+		    }
 		},
 		onLoad(option) {
+			uni.$on('usercode',(data)=>{
+				console.log('huoqu ',data)
+				this.goLogin(data)
+			})
+			uni.$on('vipMsg',(data)=>{
+				console.log('vipMsg ',data)
+				this.viptext=data
+			})
 			console.log(option)
-			// let path = 'https://userapp.fbylive.com'//福本源
-			// let path = 'https://userapp.zkhj6.com'//中康
-			// let path = 'https://user.test.ylrztop.com/api'//云融融智
-			// let path = 'https://userapp.ashyisheng.com'//蜂巢快药
-			// let path = 'https://userapp.whhm.ylrzcloud.com/prod-api'//惠名大药房
-			// let path = 'https://userapp.xdtongshuntang.top'//同顺堂
-			// let path = 'https://userapp.liangmiaoedu.com'//良苗
-			// let path = 'https://usercourse.beliyostore.com'//倍力优
-			// let path = 'https://userapp.bainian1000y.cn/prod-api'//百年康城
-			// let path = 'https://userapp.drkzyy.cn/prod-api'//青岛市德瑞康
 			let path = 'https://userapp.moonxiang.com/prod-api'//存在文化
 			uni.setStorageSync('requestPath',path)
-			if(uni.getStorageSync('userInfo')&&JSON.stringify(uni.getStorageSync('userInfo'))!='{}') {
-				this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
+			if(uni.getStorageSync('userInfo')&&uni.getStorageSync('userInfo')!='{}') {
+				this.userInfo = uni.getStorageSync('userInfo')
 			} else {
 				this.userInfo = {}
 			}
@@ -155,10 +175,23 @@
 			let obj=uni.getStorageSync('TOKEN_KEY');
 			// #endif
 			// let obj=uni.getStorageSync('AppToken');
+			let becomeVip={}
+			if(!option.becomeVip){
+				const keys = decodeURIComponent(Object.keys(option)[0]);
+				becomeVip=JSON.parse(keys.split('becomeVip=')[1])
+				console.log(becomeVip)
+			}else{
+				becomeVip = option.becomeVip ? JSON.parse(decodeURIComponent(option.becomeVip)) : {}
+			}
 			this.isLogin = !!obj;
-			this.companyid = option.companyId || ''
-			this.companyUserId=option.companyUserId || 0
-			this.projectId=option.projectId
+			this.companyid = becomeVip.companyId || ''
+			this.companyUserId=becomeVip.companyUserId || 0
+			this.projectId=becomeVip.projectId
+			this.H5course.companyId=becomeVip.companyId
+			this.H5course.companyUserId=becomeVip.companyUserId
+			this.H5course.projectId=becomeVip.projectId
+			uni.setStorageSync('H5course',this.H5course)
+			console.log(this.H5course)
 			//#ifdef MP-WEIXIN
 			// if(this.$store.state.logoname!=='乐氏本源'&&!uni.getStorageSync('userInfos')){
 			// 	this.userlogo=true
@@ -169,27 +202,19 @@
 				})
 				return
 			}
-			// if(this.$store.state.logoname=='乐氏本源'){
-			// 	this.userInfos=uni.getStorageSync('userInfos')
-			// 	if(!uni.getStorageSync('userInfos')){
-			// 		uni.navigateTo({
-			// 			url:'/pages_course/webview'
-			// 		})
-			// 	}
-			// }
 			//#endif
-			if(option.tagids=="null"){
+			if(becomeVip.tagids==null||becomeVip.tagids==''){
 				this.tagIds=[]
 			}else{
-				this.tagIds=option.tagids 
+				this.tagIds=becomeVip.tagids 
 				const arr =this.tagIds.split("，")
 				  .map(item => parseInt(item.trim(), 10))
 				  .filter(num => !isNaN(num)); // 过滤无效转换
 				  this.tagIds =arr
 				// console.log(this.tagIds); 
 			}
-			this.isWechat = String(navigator.userAgent.toLowerCase().match(/MicroMessenger/i)) === "micromessenger"
-			this.code = option.code
+			// this.isWechat = String(navigator.userAgent.toLowerCase().match(/MicroMessenger/i)) === "micromessenger"
+			// this.code = option.code
 				// #ifdef H5
 				if(this.code&&!this.isLogin) {
 					this.loginByMp()
@@ -198,13 +223,15 @@
 				
 		},
 		onShow() {
-			if(uni.getStorageSync('userInfo')&&JSON.stringify(uni.getStorageSync('userInfo'))!='{}') {
-				this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
+			this.getWebviewUrl()
+			if(uni.getStorageSync('userInfo')&&uni.getStorageSync('userInfo')!='{}') {
+				this.userInfo = uni.getStorageSync('userInfo')
 			} else {
 				this.userInfo = {}
 			}
 			//#ifdef MP-WEIXIN
-			this.userInfos=uni.getStorageSync('userInfos')
+			this.userinfos=uni.getStorageSync('userInfo')
+			console.log(uni.getStorageSync('userinfos'))
 			let obj=uni.getStorageSync('TOKEN_WEXIN');
 			//#endif
 			// #ifdef H5
@@ -212,68 +239,86 @@
 			// #endif
 			this.isLogin = !!obj;
 			if(this.isLogin&&this.isVip!=1) {
-				this.checkUserInfoA()
+				this.registerCourse()
 			}
 			
 		},
 		methods: {
-			//检查用户昵称以及头像
-			checkUserInfoA(){
-				checkUserInfo().then(res=>{
-					if(res.code==200){
-						this.isLogin = true
-						this.userInfo= res.user
-						uni.setStorageSync('userInfo', JSON.stringify(res.user));
-						this.nameuser
-						if(this.nameuser==''){
-							this.userinfos.nickname=this.userInfo.nickname
-						}
-						this.registerCourse()
-					}else if(res.code==500){
-						if(res.authType==2){
-							uni.setStorageSync('authUrl',res.domain)
-							if(!uni.getStorageSync('userInfos')||uni.getStorageSync('userInfos')=={}){
-								uni.navigateTo({
-									url:'/pages_course/webview'
-								})
-								return
-							}
-							this.editUserA()
+			getWebviewUrl() {
+				var data = {
+					key: 'course.config',
+					appId:wx.getAccountInfoSync().miniProgram.appId,
+				}
+					getConfigByKey(data).then(res => {
+						if (res.code == 200) {
+							console.log("getConfigByKey====", JSON.parse(res.data))
+							let data = JSON.parse(res.data,)
+							this.miniAppAuthType=data.miniAppAuthType
+							uni.setStorageSync('miniAppAuthType',data.miniAppAuthType)
+							uni.setStorageSync('setWebviewUrl',data.userCourseAuthDomain)
 						}else{
-							this.userlogo=true
+							uni.showToast({
+								icon:'none',
+								title: res.msg,
+							});
 						}
-					}else{
-						uni.showToast({
-							icon:'none',
-							title:res.msg,
-						});
-					}
-				})
+					})
 			},
-			//修改用户昵称以及头像
-			editUserA(){
-				this.userinfos=uni.getStorageSync('userInfos')?uni.getStorageSync('userInfos'):this.userinfos
-				const data={
-					nickname:this.userinfos.nickname,
-					avatar:this.userinfos.avatar,
+			goLogin(data) {
+				console.log('huoqu111',data)
+				if(data){
+					console.log('huoqu1222',data)
+					uni.showLoading({
+						title: '加载中'
+					})
+					uni.login({
+						provider: "weixin",
+						success: async loginRes => {
+							console.log(loginRes)
+							let code = loginRes.code // 获取开发code
+							handleFsUserWx({
+							   code: code,
+							   appId:this.appid,
+							   userId:data.userId
+							})
+							.then( res => {
+								if(res.code==200){
+									console.log(res)
+									uni.hideLoading();
+									uni.showToast({
+										icon:'none',
+										title: "登录成功",
+									});
+									this.userinfos=uni.getStorageSync('userinfos')
+									uni.getStorageSync('TOKEN_WEXIN');
+									this.userInfo=uni.getStorageSync('userInfo');
+									this.isLogin = true
+									setTimeout(()=>{
+										this.registerCourse()
+									},200)
+								}else if(res.code==406){
+									uni.hideLoading();
+									uni.showToast({
+										icon:'none',
+										title: '该用户已成为其他销售会员',
+									});
+								}else{
+									uni.hideLoading();
+									uni.showToast({
+										icon:'none',
+										title: res.msg,
+									});
+								}
+							   
+							 })
+						},
+					})
+				}else{
+					uni.navigateTo({
+						url:'/pages_course/webview?H5course='+uni.getStorageSync('H5course')
+					})
 				}
-				editUser(data).then(res=>{
-					if(res.code==200){
-						uni.showToast({
-							icon:'none',
-							title:'修改成功！',
-						});
-						setTimeout(()=>{
-							this.registerCourse()
-						},100)
-					}else{
-						uni.removeStorageSync('userInfos')
-						uni.showToast({
-							icon:'none',
-							title:res.msg+'请重新申请',
-						});
-					}
-				})
+				
 			},
 			shouquan(){
 				if(this.userinfos.nickname==''){
@@ -339,6 +384,11 @@
 						duration: 2000,
 					})
 				}else{
+					if(this.miniAppAuthType==2){
+						this.goLogin()
+					}else{
+						this.goLogins()
+					}
 					uni.showToast({
 						title: this.viptext,
 						icon: 'none',
@@ -347,97 +397,75 @@
 				}
 				
 			},
-			userInfologin(e) {
-				console.log(123333)
-				this.userdisabled=true
-				var that=this;
+			goLogins(){
+				// this.userdisabled=true
 				uni.showLoading({
-					title: "加载中..."
+					title: "处理中..."
 				});
-				if (e.mp.detail.errMsg == 'getUserInfo:ok') {
-					this.utils.getProvider()
-					.then(provider => {
-						if (!provider) {
+				// uni登录
+				let provider = 'weixin'
+				uni.login({
+					provider: provider,
+					success: async loginRes => {
+						console.log(loginRes)
+						let code = loginRes.code // 获取开发code
+						this.userinfos=uni.getStorageSync('userinfos')?uni.getStorageSync('userinfos'):this.userinfos
+						loginByMiniApp({
+						   code: loginRes.code,
+						   encryptedData:loginRes.encryptedData,
+						   iv:loginRes.iv,
+						   companyId : this.companyid || '',
+						   companyUserId:this.companyUserId || 0,
+						   nickname:this.userinfos.nickname ||'',
+						   avatar:this.userinfos.avatar||'',
+						   authType:this.authType,
+						   appId:this.appid,
+						   projectId:this.projectId
+						})
+						.then( res => {
 							this.userdisabled=false
-						  reject()
-						}
-						// uni登录
-						uni.login({
-							provider: provider,
-							success: async loginRes => {
-								let code = loginRes.code // 获取开发code
-								this.userinfos=uni.getStorageSync('userInfos')?uni.getStorageSync('userInfos'):this.userinfos
-								loginByMiniApp({
-								   encryptedData: e.mp.detail.encryptedData,
-								   iv: e.mp.detail.iv,
-								   code: code,
-								   nickname:this.userinfos.nickname?this.userinfos.nickname:'',
-								   avatar:this.userinfos.avatar?this.userinfos.avatar:'',
-								   companyId : this.companyid || '',
-								   companyUserId:this.companyUserId || 0,
-								   authType:this.authType,
-								   appId:this.appid,
-								   projectId:this.projectId
-								})
-								.then( res => {
-									if(res.code==200){
-										// console.log(res)
-										uni.hideLoading();
-										uni.showToast({
-											icon:'none',
-											title: "登录成功",
-										});
-										uni.setStorageSync('TOKEN_WEXIN', res.token);
-										uni.setStorageSync('userInfo', JSON.stringify(res.user));
-										this.userInfo=res.user;
-										uni.hideLoading()
-										this.userdisabled=false
-										// this.isLogin = true
-										setTimeout(()=>{
-											this.checkUserInfoA()
-											// this.registerCourse()
-										},200)
-									}else if(res.code==406){
-										uni.hideLoading();
-										uni.showToast({
-											icon:'none',
-											title: '该用户已成为其他销售会员',
-										});
-									}
-									else{
-										uni.hideLoading();
-										uni.showToast({
-											icon:'none',
-											title: res.msg,
-										});
-									}
-								   
-								 })
-								 .catch(res=>{
-								 	 this.userdisabled=false
-								 })
-							},
-							fail() {
-								this.userdisabled=false
+							if(res.code==200){
+								console.log(res)
+								uni.hideLoading();
+								uni.showToast({
+									icon:'none',
+									title: "登录成功",
+								});
+								this.$store.commit('setCoureLogin', 1);
+								this.userinfos=uni.getStorageSync('userinfos')
+								uni.setStorageSync('TOKEN_WEXIN', res.token);
+								uni.setStorageSync('userInfo',res.user);
+								this.userInfo=res.user
+								this.isLogin = true
+							}else if(res.code==406){
+								uni.hideLoading();
+								uni.showToast({
+									icon:'none',
+									title: '该用户已成为其他销售会员',
+								});
+							}else{
+								uni.hideLoading();
+								if (res.msg.length >14) {
+								  uni.showModal({
+									title: '提示',
+									content: res.msg,
+									showCancel: false,
+									confirmText: '我知道了'
+								  })
+								} else {
+								  uni.showToast({
+									title: res.msg,
+									icon: 'none'
+								  })
+								}
 							}
-						})
-					})
-					.catch(err => {
-						this.userdisabled=false
-						uni.showToast({
-							icon:'none',
-							title: err,
-						});
-					})
-					 
-				} else {
-					this.userdisabled=false
-					uni.showToast({
-						title: '已拒绝授权',
-						icon: 'none',
-						duration: 2000,
-					})
-				}
+						   
+						 })
+						 .catch(res=>{
+							 this.userdisabled=false
+						 })
+					},
+				})
 			},
 			// 微信用户手机号登录
 			phoneLogin(e) {

pages_course/components/courseExpiration.vue

@@ -0,0 +1,65 @@
+<template>
+	<view class="container-body">
+		<image class="kfqrcode" v-if="qrcode" :src="qrcode" show-menu-by-longpress="true"></image>
+		<image v-else src="/static/course_expiration_img.png" mode="aspectFill"></image>
+		<u-parse class="title" :content="msg"></u-parse>
+		<view class="user" v-if="userId">#{{userId}}</view>
+		<view style="margin-bottom: 10vh;" v-show="code">状态码：{{code}}</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props:['code','qrcode','msg','userId'],
+		data() {
+			return {
+			
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.kfqrcode {
+		height: 460rpx;
+		width: 460rpx;
+	}
+	.container-body {
+		background-color: #fff;
+		position: fixed;
+		top: 0;
+		right: 0;
+		z-index: 9998;
+		justify-content: center;
+		font-family: PingFang SC, PingFang SC;
+		font-weight: 400;
+		font-size: 32rpx;
+		color: #757575;
+		line-height: 48rpx;
+		text-align: center;
+		height: 100vh;
+		width: 100vw;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		.title {
+			font-weight: bold;
+			font-size: 40rpx;
+			color: #1E2F67;
+			margin-bottom: 24rpx;
+			padding: 0 60rpx;
+		}
+		image {
+			width: 428rpx;
+			height: 360rpx;
+			margin-bottom: 30rpx;
+		}
+		.user {
+			// position: absolute;
+			right: 24rpx;
+			top: 124rpx;
+			z-index: 9999;
+		}
+	}
+</style>

pages_course/learn.vue

@@ -5,7 +5,7 @@
 			<view class="top-box">
 				<view class="title">{{learncourse.courseName}}</view>
 				<view class="txt">
-					<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/learn1.png"></image>
+					<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/learn1.png"></image>
 					<text>共{{learnList.length}}节课</text>
 				</view>
 			</view>
@@ -15,13 +15,13 @@
 			<view class="list" v-for="(item,index) in learnList" :key="index">
 				<view class="img-box">
 					<view class="sub">第{{index+1}}课</view>
-					<image :src="item.videoImgUrl || 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/no-img.png'" mode="aspectFill"></image>
+					<image :src="item.videoImgUrl || 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/no-img.png'" mode="aspectFill"></image>
 				</view>
 				<view class="right">
 					<view class="title">{{item.title}}</view>
 					<view class="bottom">
 						<!-- <view class="tip">
-							<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/learn3.png" mode="widthFix"></image>
+							<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/learn3.png" mode="widthFix"></image>
 							<text>答题送金币+200</text>
 						</view> -->
 						<!-- <view @click="goLive(item)" class="btn" v-if="item.stauts==0">已学习4%</view> -->

pages_course/reward.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="answerPopup-box bg">
 		<!-- 正确 -->
-		<image class="tipimg" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/course_answer_img.png"
+		<image class="tipimg" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/course_answer_img.png"
 			mode="aspectFill"></image>
 		<view class="answerPopup-title">恭喜你，回答正确</view>
 		<view class="answerPopup-desc">您有一份奖励待领取哦</view>

pages_course/teacherClassroom.vue

@@ -2,7 +2,7 @@
 	<view class="container">
 		<view class="top">
 			<text class="title"><text class="title-brown">健康生活方式</text>大讲堂</text>
-			<image class="top-bg" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/famous1.png"></image>
+			<image class="top-bg" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/famous1.png"></image>
 			<view class="txt">
 				<view>让医学回归生活化,</view>
 				<view>以健康的生活方式,</view>
@@ -10,16 +10,16 @@
 			</view>
 		</view>
 		<view class="container-body">
-			<image class="bg" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/bg-class.png"></image>
+			<image class="bg" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/bg-class.png"></image>
 			<text class="title">{{type==1?'健康大讲堂':'生活大讲堂'}}</text>
 			<view class="card-box" v-for="(item,index) in cardList" :key="index" @click="goLearn(item.courseId)">
 				<view class="bar">
-					<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/bar.png" mode="widthFix"></image>
+					<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/bar.png" mode="widthFix"></image>
 					<view class="tit">{{item.courseName}}</view>
 				</view>
 				<view class="img-box">
 					<view class="img">
-						<image :src="item.imgUrl || 'https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/no-img.png'" mode="widthFix"></image>
+						<image :src="item.imgUrl || 'https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/no-img.png'" mode="widthFix"></image>
 					</view>
 				</view>
 			</view>

pages_course/video.vue

@@ -7,7 +7,7 @@
 			</view>
 			<view class="arrow-left-warning" v-else @click="feedback">
 				<image :src="imgPath+'/app/image/warning.png'"></image>
-				<text>投诉</text>
+				<!-- <text>投诉</text> -->
 			</view>
 			<view class="header-title" :style="{width:menuButtonLeft + 'px',height:menuButtonH+'px',lineHeight:menuButtonH+'px'}">{{courseInfo.title}}</view>
 		</view>
@@ -240,9 +240,13 @@
 			<view class="footer-btn" v-if="!isLogin || isAddKf !=1" @click="submit">
 				<text>立即学习</text>
 			</view>
-			<view v-if="currentTab==1&&isLogin&&isAddKf==1&&quesList&&quesList.length>0" class="footer-btn footer-btn-border" @click="submit">
+			<view v-if="currentTab==1&&isLogin&&isAddKf==1&&quesList&&quesList.length>0&&isRedPackage!=0" class="footer-btn footer-btn-border" @click="submit">
 				<text>{{isOpen==1 ? '提交答案':'提交答案领取奖励'}}</text>
 			</view>
+			<view v-if="currentTab==1&&isLogin&&isAddKf==1&&quesList&&quesList.length>0&&isRedPackage==0" class="footer-btn footer-btn-border" @click="submit">
+				<text>提交答案</text>
+			</view>
+			
 			<!-- <view @click="checked=!checked" class="agreement" v-if="!isLogin">
 				<radio value="r1" :checked="checked" color="#ff5c03" activeBorderColor="#ff5c03"
 					style="transform:scale(0.6);" />
@@ -257,6 +261,9 @@
 				<button class="send" @click="handleChatInput">发送</button>
 			</view>
 		</view>
+		<ykscreenRecord></ykscreenRecord>
+		<courseExpiration v-if="showExpiration" :code="resCode" :msg="resMsg" :qrcode="qrcode"
+		:userId="user && user.userId ? user.userId : ''"></courseExpiration>
 	</view>
 </template>
 
@@ -267,6 +274,8 @@
 	import descInfoNav from "./components/descInfoNav.vue"
 	import commentBox from "./components/commentBox.vue"
 	import {TOKEN_KEYAuto,generateRandomString} from '@/utils/courseTool.js'
+	import ykscreenRecord from '@/components/yk-screenRecord/yk-screenRecord.vue'
+	import courseExpiration from './components/courseExpiration.vue'
 	import dayjs from 'dayjs';
 	import {
 		getErrMsg,
@@ -291,9 +300,16 @@
 			descInfo,
 			commentBox,
 			ques,
+			ykscreenRecord,
+			courseExpiration
 		},
 		data() {
 			return {
+				isRedPackage:'',
+				resMsg :'',
+				resCode:"",
+				showExpiration:false,
+				code: '',
 				code: '',
 				baseUrl:uni.getStorageSync('requestPath'),
 				// 1 红包 2 积分
@@ -427,6 +443,7 @@
 				videoitem:null,
 				// 是否公开课
 				isOpen: 0,
+				miniAppAuthType:2
 			}
 		},
 		//发送给朋友
@@ -483,11 +500,11 @@
 			}else {
 				this.isOpen = 0
 				console.log(option)
-				this.urlOption = option.course ? JSON.parse(option.course) : {}
+				this.urlOption = option.course ? JSON.parse(decodeURIComponent(option.course)) : {}
 				console.log(this.urlOption)
 			}
 			uni.$on('usercode',(data)=>{
-				if(this.isSpare == 1&&data) {
+				if(data) {
 					this.code=data.code
 					this.goLogin(data)
 				}
@@ -496,7 +513,7 @@
 			this.qwUserId = this.urlOption.qwUserId || ''
 			this.corpId = this.urlOption.corpId || ''
 			this.videolinkType = this.urlOption.linkType || 0
-
+			this.urlOption.appId=wx.getAccountInfoSync().miniProgram.appId
 			var that=this;
 			if (this.videoId) {
 				this.getH5CourseByVideo()
@@ -518,7 +535,7 @@
 				this.user = {}
 			}
 
-			if((this.sortLink||this.isOpen==1)&&!this.code){
+			if((this.sortLink)&&!this.code){
 				this.getLink()
 			} else {
 				if(this.code) return;
@@ -572,12 +589,15 @@
 		methods: {
 			getWebviewUrl() {
 				var data = {
-					key: 'course.config'
+					key: 'course.config',
+					appId:wx.getAccountInfoSync().miniProgram.appId,
 				}
 				getConfigByKey(data).then(res => {
 					if (res.code == 200) {
 						console.log("getConfigByKey====", JSON.parse(res.data))
 						let data = JSON.parse(res.data,)
+						this.miniAppAuthType=data.miniAppAuthType
+						uni.setStorageSync('miniAppAuthType',data.miniAppAuthType)
 						uni.setStorageSync('setWebviewUrl',data.userCourseAuthDomain)
 					}else{
 						uni.showToast({
@@ -773,6 +793,7 @@
 							this.duration = res.course && res.course.duration ? res.course.duration : 0
 							this.playDuration = res.playDuration || 0
 							this.tipsTime = res.tipsTime || 0
+							this.isRedPackage=res.isRedPackage
 							let lineList = []
 							if (res.course && res.course.lineOne) {
 								lineList.push(res.course.lineOne)
@@ -829,12 +850,17 @@
 								this.player.play();
 							}
 							this.updateTime();
-							this.quesList = res.questions && res.questions.length > 0 ? res.questions : [],
-								this.quesList = this.quesList.map(item => ({
-									...item,
-									questionOption: JSON.parse(item.question),
-									answer: ''
-								}))
+							this.quesList = res.questions && res.questions.length > 0 ? res.questions : [];
+							this.quesList = this.quesList.map(item => ({
+								...item,
+								questionOption: JSON.parse(item.question),
+								answer: ''
+							}))
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: "none"
+							})
 						}
 						this.getHeight()
 						this.$nextTick(()=>{
@@ -1012,6 +1038,13 @@
 									this.$refs.answerPopup.open("center")
 									return
 								}
+								if(this.isRedPackage==0) {
+									uni.showToast({
+										title:"恭喜你，回答正确",
+										icon: "none"
+									})
+									return
+								}
 								this.closeAnswerPopup(1)
 							}
 						} else {
@@ -1136,15 +1169,18 @@
 							this.qrcode = res.qrcode
 							this.qrcodeMsg = res.msg
 							this.$refs.kfPopup.open()
+							this.initExpiration(res.msg,res.code)
 						} else if (res.code == 504) {
 							// 登录
-							// this.goLogin()
+							this.goLogin()
+							this.initExpiration(res.msg,res.code)
 						} else if (res.code == 566) {
 							// 官方群发通用链接
 							const url = res.courseLink.realLink.split('?course=')[1]
 							this.urlOption = JSON.parse(url)
 							this.isAddKf = 1
 							this.getH5CourseVideoDetails()
+							// this.initExpiration(res.msg,res.code)
 						} else if (res.code == 567) {
 							// 群聊通用链接
 							this.urlOption = {
@@ -1153,17 +1189,25 @@
 							}
 							this.isAddKf = 1
 							this.getH5CourseVideoDetails()
+							// this.initExpiration(res.msg,res.code)
 						} else {
 							this.isAddKf = 0
 							uni.showToast({
 								title: res.msg,
 								icon: 'none'
 							});
+							this.initExpiration(res.msg,res.code)
 						}
 					},
 					err => {}
 				);
 			},
+			initExpiration(resMsg,resCode) {
+				if(resCode==401) return;
+				this.resMsg = resMsg
+				this.resCode = resCode
+				this.showExpiration = true
+			},
 			closeKFPop() {
 				this.$refs.kfPopup.close()
 			},
@@ -1225,10 +1269,17 @@
 				})
 			},
 			goLogin(data) {
-				if((data || this.isSpare==1)&&this.isOpen==0) {
+				// if((data || this.isSpare==1)&&this.isOpen==0) {
+				// 	this.loginFsUserWx(data)
+				// 	return
+				// }
+				// isOpen==1公开课
+				console.log('=====2',this.miniAppAuthType,this.isOpen,data)
+				if(data || (this.isOpen!=1&&this.miniAppAuthType==2)) {
 					this.loginFsUserWx(data)
 					return
 				}
+				console.log('this.miniAppAuthType------',this.miniAppAuthType)
 				let provider = 'weixin'
 				uni.login({
 					provider: provider,
@@ -1249,7 +1300,7 @@
 								}).then(res=>{
 									 uni.hideLoading();
 									 if (res.code == 200) {
-										 this.$store.commit('setCoureLogin', 1);
+										this.$store.commit('setCoureLogin', 1);
 										uni.setStorageSync(TOKEN_KEYAuto, res.token);
 										uni.setStorageSync('auto_userInfo', JSON.stringify(res.user));
 										this.user = res.user

pages_course/videovip.vue

@@ -1,9 +1,9 @@
 <template>
 	<view class="content " >
-		<!-- <view class="header-nav" :style="{height: `calc(88rpx + ${statusBarHeight}px)`,paddingTop: statusBarHeight + 'px'}">
+		<view class="header-nav" :style="{height: `calc(88rpx + ${statusBarHeight}px)`,paddingTop: statusBarHeight + 'px'}">
 			<u-icon name="arrow-left" size="28" @click="tosales" v-if="appToken"></u-icon>
 			<view class="header-title" :style="{width:menuButtonLeft + 'px',height:menuButtonH+'px',lineHeight:menuButtonH+'px'}">{{courseInfo.title}}</view>
-		</view> -->
+		</view>
 		<view class="video-box" >
 			<image v-if="!isLogin || isAddKf!=1" class="video-poster" :src="courseInfo.imgUrl" mode="aspectFill">
 			</image>
@@ -64,7 +64,7 @@
 					</view>
 				</template>
 				<view class="descbox-desc" id="descbox-desc" :style="{height: isExpand ? 'auto': '42rpx'}">
-					<text>{{courseInfo.description==null?'暂无简介':courseInfo.description}}</text>
+					<text>{{courseInfo.description==null?'':courseInfo.description}}</text>
 					<view :class="isExpand ? 'expand': 'expand expand-ab'" v-if="isLogin&&isAddKf==1&&textHeight > 21">
 						<text @click="handleExpand">{{isExpand ? '收起简介' : '展开简介'}}</text>
 						<image :src="imgPath+'/app/image/course_arrow_up_icon.png'" v-show="isExpand"></image>
@@ -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"  >
@@ -259,8 +259,12 @@
 					class="author-btn"
 					open-type="getUserInfo" :disabled="userdisabled"
 					@getuserinfo="userInfologin"  v-if="authType==0&&!isquestion">{{isLogin&&isAddKf==1 ? '提交答案领取奖励' : '立即学习'}}</button> -->
-				<button class="author-btn"  
-				@click="submit">{{isLogin&&isAddKf==1 ?'提交答案领取奖励' : '立即学习'}}</button>
+				<button class="author-btn" v-if="quesList&&quesList.length>0&&isLogin&&isAddKf==1&&isRedPackage!=0"
+				@click="submit">提交答案领取奖励</button>
+				<button class="author-btn" v-if="quesList&&quesList.length>0&&isLogin&&isAddKf==1&&isRedPackage==0"
+				@click="submit">提交答案</button>
+				<button class="author-btn"   v-if="!isLogin&&isAddKf!=1 "
+				@click="submit">立即学习</button>
 			</view>
 		</view>
 		<view>
@@ -268,12 +272,18 @@
 		</view>
 		<u-loading-page :loading="viewload" iconSize="32" loadingColor="#3c9cff" fontSize="24"
 		:loading-text="loadingtext"></u-loading-page>
+		<ykscreenRecord></ykscreenRecord>
+		<courseExpiration v-if="showExpiration" :code="resCode" :msg="resMsg" :qrcode="qrcode" 
+		:userId="user && userInfo.userId ? userInfo.userId : ''"></courseExpiration>
 	</view>
 </template>
 
 <script>
 	import { generateRandomString} from "@/utils/common.js"
 	import dayjs from 'dayjs';
+	import { mapGetters } from 'vuex';
+	import ykscreenRecord from './yk-screenRecord/yk-screenRecord.vue'
+	import courseExpiration from './components/courseExpiration.vue'
 	import {
 		getErrMsg,
 		getH5CourseByVideoId,
@@ -291,9 +301,17 @@
 	import {
 		getConfigByKey
 	} from "@/api/user.js"
+	
 	export default {
+		components: {
+			ykscreenRecord,
+			courseExpiration
+		},
 		data() {
 			return {
+				resMsg :'',
+				resCode:"",
+				showExpiration:false,
 				videoItem:{},
 				viewload:true,
 				loadingtext:"数据加载中...",
@@ -424,6 +442,8 @@
 				projectId:'',
 				showfalse:false,
 				contentmsg:null,
+				isRedPackage:null,
+				miniAppAuthType:2
 			}
 		},
 		filters: {
@@ -464,8 +484,27 @@
 			avataruser() {
 				return this.userinfos.avatar
 			},
+			...mapGetters(['coureLogin']),
+		},
+		watch: {
+		    coureLogin: {
+		      immediate: true,          // 页面一进入就检查一次
+		      handler(val) {
+		        if (val == 2&&this.isLogin) {
+					console.log("看课AppToken失效，请重新登录")
+					this.isLogin = false
+					this.isAddKf = 0
+					if(this.miniAppAuthType==2){
+						this.goLogin()
+					}else{
+						this.goLogins()
+					}
+		        }
+		      }
+		    }
 		},
 		onLoad(option) {
+	
 			this.getWebviewUrl()
 			uni.$on('usercode',(data)=>{
 				console.log('huoqu ',data)
@@ -493,7 +532,8 @@
 				const keys = decodeURIComponent(Object.keys(option)[0]);
 				this.urlOption=JSON.parse(keys.split('course=')[1])
 			}else{
-				this.urlOption = option.course ? JSON.parse(option.course) : {}
+				console.log(4444,option)
+				this.urlOption = option.course ? JSON.parse(decodeURIComponent(option.course)) : {}
 			}
 			uni.setStorageSync('H5course',this.urlOption)
 			this.videoId = this.urlOption.videoId
@@ -508,11 +548,11 @@
 			// this.sortLink = this.urlOption.link || ''
 			this.getMenuButton()
 			// #ifdef MP-WEIXIN
-			// if(this.$store.state.logoname!=='乐氏本源'&&!uni.getStorageSync('userInfos')){
+			// if(this.$store.state.logoname!=='乐氏本源'&&!uni.getStorageSync('userinfos')){
 			// 	this.userlogo=true
 			// }
-			console.log(uni.getStorageSync('userInfos'))
-			if(!uni.getStorageSync('userInfos')&&this.$store.state.logoname=='乐氏本源'){
+			console.log(uni.getStorageSync('userinfos'))
+			if(!uni.getStorageSync('userinfos')&&this.$store.state.logoname=='乐氏本源'){
 				uni.navigateTo({
 					url:'/pages_course/webview'
 				})
@@ -522,7 +562,7 @@
 		},
 		onShow() {
 			this.userinfos=uni.getStorageSync('userinfos')
-			this.userinfo=uni.getStorageSync('userinfo')
+			this.userInfo=uni.getStorageSync('userInfo')
 			this.tipsOpen = false
 			this.isExpand = true
 			this.uuId = generateRandomString(16)
@@ -533,7 +573,7 @@
 			console.log(AppToken)
 			if(AppToken){
 				// this.isLogin=true
-				if(this.isAddKf == 1&&this.userinfo.userId){
+				if(this.isAddKf == 1&&this.userInfo.userId){
 					console.log(1233)
 					this.getH5CourseVideoDetails()
 				} else{
@@ -588,12 +628,15 @@
 		methods: {
 			getWebviewUrl() {
 				var data = {
-					key: 'course.config'
+					key: 'course.config',
+					appId:wx.getAccountInfoSync().miniProgram.appId,
 				}
 					getConfigByKey(data).then(res => {
 						if (res.code == 200) {
 							console.log("getConfigByKey====", JSON.parse(res.data))
 							let data = JSON.parse(res.data,)
+							this.miniAppAuthType=data.miniAppAuthType
+							uni.setStorageSync('miniAppAuthType',data.miniAppAuthType)
 							uni.setStorageSync('setWebviewUrl',data.userCourseAuthDomain)
 						}else{
 							uni.showToast({
@@ -630,10 +673,10 @@
 									uni.getStorageSync('TOKEN_WEXIN');
 									this.userInfo=uni.getStorageSync('userInfo');
 									this.isLogin = true
-									this.getH5CourseVideoDetails()
-									// setTimeout(()=>{
-									// 	this.getIsAddKf()
-									// },200)
+									// this.getH5CourseVideoDetails()
+									setTimeout(()=>{
+										this.getIsAddKf()
+									},200)
 								}else if(res.code==406){
 									uni.hideLoading();
 									uni.showToast({
@@ -681,7 +724,7 @@
 					});
 					return
 				}
-				uni.setStorageSync('userInfos',this.userinfos)
+				uni.setStorageSync('userinfos',this.userinfos)
 				this.editUserA()
 				this.userlogo=false
 			},
@@ -714,7 +757,7 @@
 			},
 			tosales(){
 				uni.switchTab({
-					url:"/pages/index/index"
+					url:"/pages/home/index"
 				})
 			},
 			closepop(){
@@ -723,31 +766,23 @@
 			open(){
 				
 			},
-			userInfologin(e){
-				console.log(e)
-				this.userdisabled=true
+			goLogins(){
+				// this.userdisabled=true
 				uni.showLoading({
 					title: "处理中..."
 				});
-				if (e.mp.detail.errMsg == 'getUserInfo:ok') {
-					this.utils.getProvider()
-					.then(provider => {
-						if (!provider) {
-							this.userdisabled=false
-						  reject()
-						}
 						// uni登录
+						let provider = 'weixin'
 						uni.login({
 							provider: provider,
 							success: async loginRes => {
 								console.log(loginRes)
-								console.log(e)
 								let code = loginRes.code // 获取开发code
-								this.userinfos=uni.getStorageSync('userInfos')?uni.getStorageSync('userInfos'):this.userinfos
+								this.userinfos=uni.getStorageSync('userinfos')?uni.getStorageSync('userinfos'):this.userinfos
 								loginByMiniApp({
-								   encryptedData: e.mp.detail.encryptedData,
-								   iv: e.mp.detail.iv,
-								   code: code,
+								   code: loginRes.code,
+								   encryptedData:loginRes.encryptedData,
+								   iv:loginRes.iv,
 								   companyId : this.companyId || '',
 								   companyUserId:this.companyUserId || 0,
 								   nickname:this.userinfos.nickname ||'',
@@ -765,13 +800,16 @@
 											icon:'none',
 											title: "登录成功",
 										});
+										this.$store.commit('setCoureLogin', 1);
+										this.userinfos=uni.getStorageSync('userinfos')
 										uni.setStorageSync('TOKEN_WEXIN', res.token);
-										uni.setStorageSync('userInfo', JSON.stringify(res.user));
-										this.userInfo=res.user;
-										uni.hideLoading()
-										// this.checkUserInfoA()
-										// this.isLogin = true
-										
+										uni.setStorageSync('userInfo',res.user);
+										this.userInfo=res.user
+										this.isLogin = true
+										// this.getH5CourseVideoDetails()
+										setTimeout(()=>{
+											this.getIsAddKf()
+										},200)
 									}else if(res.code==406){
 										uni.hideLoading();
 										uni.showToast({
@@ -780,10 +818,19 @@
 										});
 									}else{
 										uni.hideLoading();
-										uni.showToast({
-											icon:'none',
-											title: res.msg,
-										});
+										if (res.msg.length >14) {
+										  uni.showModal({
+										    title: '提示',
+										    content: res.msg,
+										    showCancel: false,
+										    confirmText: '我知道了'
+										  })
+										} else {
+										  uni.showToast({
+										    title: res.msg,
+										    icon: 'none'
+										  })
+										}
 									}
 								   
 								 })
@@ -791,27 +838,7 @@
 									 this.userdisabled=false
 								 })
 							},
-							fail() {
-								this.userdisabled=false
-							}
 						})
-					})
-					.catch(err => {
-						this.userdisabled=false
-						uni.showToast({
-							icon:'none',
-							title: err,
-						});
-					})
-					 
-				} else {
-					this.userdisabled=false
-					uni.showToast({
-						title: '已拒绝授权',
-						icon: 'none',
-						duration: 2000,
-					})
-				}
 			},
 			phoneLogin(e) {
 				console.log(e)
@@ -834,7 +861,7 @@
 								console.log(loginRes)
 								console.log(e)
 								let code = loginRes.code // 获取开发code
-								this.userinfos=uni.getStorageSync('userInfos')?uni.getStorageSync('userInfos'):this.userinfos
+								this.userinfos=uni.getStorageSync('userinfos')?uni.getStorageSync('userinfos'):this.userinfos
 								loginByMiniApp({
 								   encryptedData: e.mp.detail.encryptedData,
 								   iv: e.mp.detail.iv,
@@ -1079,6 +1106,7 @@
 				}
 				getH5CourseVideoDetails(data).then(res => {
 						if (res.code == 200) {
+							this.isRedPackage=res.data.isRedPackage
 							this.config = res.data.courseConfig || {}
 							this.isFinish = res.data.isFinish || 0
 							this.duration = res.data.courseVideoDetails && 
@@ -1145,12 +1173,17 @@
 							}
 							console.log('题目',res.data.courseVideoDetails.questionBankList)
 							this.quesList = res.data.courseVideoDetails.questionBankList
-							 && res.data.courseVideoDetails.questionBankList.length > 0 ? res.data.courseVideoDetails.questionBankList : [],
-								this.quesList = this.quesList.map(item => ({
-									...item,
-									questionOption: JSON.parse(item.question),
-									answer: ''
-								}))
+							 && res.data.courseVideoDetails.questionBankList.length > 0 ? res.data.courseVideoDetails.questionBankList : [];
+							this.quesList = this.quesList.map(item => ({
+								...item,
+								questionOption: JSON.parse(item.question),
+								answer: ''
+							}))
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: "none"
+							})
 						}
 						this.getHeight()
 						this.getDescHeight()
@@ -1231,7 +1264,11 @@
 								}
 							} 
 						} else{
-							this.goLogin()
+							if(this.miniAppAuthType==2){
+								this.goLogin()
+							}else{
+								this.goLogins()
+							}
 						}
 					},
 					rej => {}
@@ -1302,14 +1339,21 @@
 								// this.$refs.answerPopup.open("center")
 								// this.answerPopup=true
 								if(res.msg=='答题成功'){
-									uni.login({
-										provider: 'weixin',
-										success: async loginRes => {
-											console.log(loginRes)
-											var code=loginRes
-											this.closeAnswerPopup(loginRes.code)
-										}
-									})
+									if(this.isRedPackage==0){
+										uni.showToast({
+											title:  "恭喜你，回答正确",
+											icon: "none"
+										})
+									}else{
+										uni.login({
+											provider: 'weixin',
+											success: async loginRes => {
+												console.log(loginRes)
+												var code=loginRes
+												this.closeAnswerPopup(loginRes.code)
+											}
+										})
+									}
 								}
 							}
 						} else {
@@ -1454,7 +1498,8 @@
 					companyId:this.companyId,
 					courseId:this.courseId,
 					periodId:this.periodId,
-					projectId:this.projectId
+					projectId:this.projectId,
+					appId:wx.getAccountInfoSync().miniProgram.appId
 				}
 				// {videoId: this.videoId,qwUserId: this.qwUserId,corpId: this.corpId}
 				getIsAddKf(data).then(res => {
@@ -1465,6 +1510,12 @@
 								if(this.userInfo.userId){
 									this.getH5CourseVideoDetails()
 									console.log(123223)
+								}else{
+									if(this.miniAppAuthType==2){
+										this.goLogin()
+									}else{
+										this.goLogins()
+									}
 								}
 								
 							}
@@ -1477,25 +1528,28 @@
 						}else if(res.code==1002){
 							this.isAddKf = 0
 							this.qrcode=res.ext
-							this.kfPopup=true
+							// this.kfPopup=true
 							uni.showToast({
 								title: "请添加管理员微信，成为会员！",
 								icon: 'none'
 							});
+							this.initExpiration(res.msg,res.code)
 						}else if(res.code==505){
 							this.isAddKf = 0
 							this.qrcode=res.ext
-							this.kfPopup=true
+							// this.kfPopup=true
 							uni.showToast({
 								title: "管理员开启了会员审核，请等待审核!",
 								icon: 'none'
 							});
+							this.initExpiration(res.msg,res.code)
 						}else if(res.code==406){
 							uni.hideLoading();
 							uni.showToast({
 								icon:'none',
 								title: '该用户已成为其他销售会员',
 							});
+							this.initExpiration(res.msg,res.code)
 						}else if(res.code==504){
 							this.isAddKf = 0
 							this.iskftype=1
@@ -1504,17 +1558,25 @@
 								title: res.msg,
 								icon: 'none'
 							});
+							this.initExpiration(res.msg,res.code)
 						}else {
 							this.isAddKf = 0
 							uni.showToast({
 								title: res.msg,
 								icon: 'none'
 							});
+							this.initExpiration(res.msg,res.code)
 						}
 					},
 					err => {}
 				);
 			},
+			initExpiration(resMsg,resCode) {
+				if(resCode==401) return;
+				this.resMsg = resMsg
+				this.resCode = resCode
+				this.showExpiration = true
+			},
 			closeKFPop() {
 				// this.$refs.kfPopup.close()
 				// this.kfPopup=!this.kfPopup
@@ -1661,6 +1723,10 @@
 }
 </style>
 <style lang="scss" scoped>
+	html, body {
+	    -webkit-user-select: none;
+	    user-select: none;
+	}
 	.subname{
 		background-color: #00aa00;
 		color: #fff;

pages_course/webview.vue

@@ -39,7 +39,7 @@ export default {
     // this.webviewUrl = this.generateAuthUrl()
   },
   computed:{
-	  appid() {
+	  appId() {
 	  	return this.$store.state.appid
 	  },
   },
@@ -47,6 +47,7 @@ export default {
 	  loginweixin(datas){
 		 console.log(uni.getStorageSync('H5course'))
 		 const h5course=uni.getStorageSync('H5course')
+		 console.log(this.appid)
 		  var data = {
 		  	code: datas,
 			appId:this.appId,
@@ -58,6 +59,7 @@ export default {
 		  		this.res=res
 		  		uni.hideLoading();
 		  		if (res.code == 200) {
+					this.$store.commit('setCoureLogin', 1);
 		  			console.log(res)
 		  			uni.hideLoading();
 		  			uni.showToast({

pages_course/yk-screenRecord/yk-screenRecord.vue

@@ -0,0 +1,163 @@
+<template>
+	<view class="zzc_mol" v-if="isRecording"></view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				isRecording: false
+			}
+		},
+		created() {
+			this.screenInit();
+		},
+		onUnload() {
+			this.AllowScreenshots()
+		},
+		beforeDestroy() {
+			this.AllowScreenshots()
+		},
+		methods: {
+			screenInit() {
+				let _this = this;
+				// #ifdef H5
+				uni.showToast({
+					title: '请在APP或者小程序环境下操作',
+					icon: 'error'
+				})
+				// #endif
+				// #ifndef H5
+				uni.getSystemInfo({
+					success: function(e) {
+						// #ifdef APP-PLUS
+						if (e.platform == 'android') {
+							//注意：一旦开启禁止截屏/录屏后将会全局生效，关闭页面时记得放开允许截屏/录屏
+							_this.NoscreenCapture();
+						} else {
+							//在APP IOS端截屏、录屏暂时没办法实现，可以寻求原生解决
+						}
+						// #endif
+
+						// #ifdef MP-WEIXIN
+						if (e.platform == 'android') {
+							//微信小程序在安卓手机上 禁止截屏/录屏(注意：禁止后录屏动作还是会进行，但录屏后的视频是黑屏的)
+							wx.setVisualEffectOnCapture({
+								visualEffect: 'hidden', //传入 hidden 则表示在截屏/录屏时隐藏屏幕
+								success: (res) => {
+									console.log(res)
+								},
+								fail: (err) => {
+									console.log(err)
+								},
+								complete: (res) => {
+									console.log(res)
+								}
+							})
+						} else {
+							//微信小程序在IOS手机上，注意：目前微信小程序在ios上也只能通过监听录屏状态，然后通过添加view层来进行阻止，截屏暂时无法实现
+							//监听用户录屏事件
+							wx.onScreenRecordingStateChanged(function(res) {
+								if (res.state == 'start') {
+									_this.isRecording = true
+								} else {
+									_this.isRecording = false
+								}
+							})
+							//查询用户是否在录屏
+							wx.getScreenRecordingState({
+								success: (res) => {
+									if (res.state == 'on') {
+										_this.isRecording = true
+									} else if (res.state == 'off') {
+										_this.isRecording = false
+									}
+								},
+								fail: (err) => {
+									_this.isRecording = false
+								}
+							})
+						}
+						// #endif
+					}
+				})
+				// #endif
+			},
+			//安卓端禁止截屏
+			NoscreenCapture() {
+				let osname = plus.os.name;
+				if (osname == "Android") {
+					var activity = plus.android.runtimeMainActivity();
+					plus.android.invoke(plus.android.invoke(activity, "getWindow"), "addFlags", 0x00002000);
+				}
+			},
+			//安卓端允许截屏  
+			AllowScreenshots() {
+				let _this = this;
+				uni.getSystemInfo({
+					success: function(e) {
+						// #ifdef MP-WEIXIN
+						if (e.platform == 'android') {
+							//微信小程序在安卓手机上 禁止截屏/录屏(注意：禁止后录屏动作还是会进行，但录屏后的视频是黑屏的)
+							wx.setVisualEffectOnCapture({
+								visualEffect: 'none', //传入 hidden 则表示在截屏/录屏时隐藏屏幕
+								success: (res) => {
+									console.log(res)
+								},
+								fail: (err) => {
+									console.log(err)
+								},
+								complete: (res) => {
+									console.log(res)
+								}
+							})
+						} else {
+							//微信小程序在IOS手机上，注意：目前微信小程序在ios上也只能通过监听录屏状态，然后通过添加view层来进行阻止，截屏暂时无法实现
+							//监听用户录屏事件
+							wx.onScreenRecordingStateChanged(function(res) {
+								if (res.state == 'start') {
+									_this.isRecording = false
+								} else {
+									_this.isRecording = false
+								}
+							})
+							//查询用户是否在录屏
+							wx.getScreenRecordingState({
+								success: (res) => {
+									if (res.state == 'on') {
+										_this.isRecording = false
+									} else if (res.state == 'off') {
+										_this.isRecording = false
+									}
+								},
+								fail: (err) => {
+									_this.isRecording = false
+								}
+							})
+						}
+						// #endif
+					}
+				})
+				// #ifdef APP-PLUS
+				let osname = plus.os.name;
+				if (osname == "Android") {
+					var activity = plus.android.runtimeMainActivity();
+					plus.android.invoke(plus.android.invoke(activity, "getWindow"), "clearFlags", 0x00002000);
+				}
+				// #endif
+			}
+		}
+	}
+</script>
+
+<style>
+	.zzc_mol {
+		background: #000;
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		z-index: 99999;
+		top: 0;
+		left: 0;
+	}
+</style>

pages_doctor/doctorDetail.vue

@@ -2,12 +2,12 @@
 	<view>
 		<view class="top-cont">
 			<!-- 背景图片 -->
-			<image class="bg" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/doctordetail_top_bg.png" mode=""></image>
+			<image class="bg" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/doctordetail_top_bg.png" mode=""></image>
 			<view class="top-inner">			
 				<!-- 这里是状态栏 -->
 				<view class="status_bar" :style="{height: statusBarHeight}"></view>
 				<view class="back-box" @click="back">
-					<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/back.png" mode=""></image>
+					<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/back.png" mode=""></image>
 				</view>
 				<!-- 医生信息 -->
 				<view class="doctor-info">
@@ -62,22 +62,22 @@
 				<view class="content">
 					<!-- 擅长 -->
 					<view class="expertise">
-						<image class="label-img" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/sc_word.png" mode=""></image>
+						<image class="label-img" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/sc_word.png" mode=""></image>
 						<text :class="showExpert?'text':'text ellipsis3'" id="expert">{{doctor.doctorDesc}}</text>
 						<!-- 查看更多按钮 -->
 						<view v-if="!showExpert" class="show-more" @click="showMoreExpert">
-							<image class="mask" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/mask.png" mode=""></image>
+							<image class="mask" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/mask.png" mode=""></image>
 							<view class="inner">
 								<text class="btn">查看全部</text>
-								<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/arrow3.png" mode=""></image>
+								<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/arrow3.png" mode=""></image>
 							</view>
 						</view>
 					</view>
 					<!-- 问诊方式 -->
 					<view class="mode-box">
 						<view v-for="(price,index) in prices" :class="price.priceId == priceId?'item active':'item'" @click="choseMode(price)">
-							<image v-if="price.priceType==1" class="img" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/picture_ask.png" mode=""></image>
-							<image v-if="price.priceType==2" class="img" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/phone_ask.png" mode=""></image>
+							<image v-if="price.priceType==1" class="img" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/picture_ask.png" mode=""></image>
+							<image v-if="price.priceType==2" class="img" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/phone_ask.png" mode=""></image>
 							<view class="info">
 								<text v-if="price.priceType==1" class="label">图文问诊</text>
 								<text v-if="price.priceType==2" class="label">电话问诊</text>
@@ -93,7 +93,7 @@
 								</view>
 							</view>
 							<!-- 选中的角标 -->
-							<image v-if="price.priceId == priceId" class="active-img" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/sel_right50.png" mode=""></image>
+							<image v-if="price.priceId == priceId" class="active-img" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/sel_right50.png" mode=""></image>
 						</view>
 						 
 					</view>
@@ -107,12 +107,12 @@
 		<view class="btn-foot">
 			<view class="menu-box">
 				<view class="item" @click="goHome">
-					<image src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/back_home.png" mode=""></image>
+					<image src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/back_home.png" mode=""></image>
 					<text>首页</text>
 				</view>
 				<view class="item" @click="changeFollow">
-					<image v-if="!isFollow" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/focus.png" mode=""></image>
-					<image v-show="isFollow" src="https://bjczwh.oss-cn-beijing.aliyuncs.com/app/shop/images/focus_sel.png" mode=""></image>
+					<image v-if="!isFollow" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/focus.png" mode=""></image>
+					<image v-show="isFollow" src="https://czwh.obs.cn-southwest-2.myhuaweicloud.com/app/orangeShop/focus_sel.png" mode=""></image>
 					<text>关注</text>
 				</view>
 			</view>
@@ -342,7 +342,7 @@
 							font-family: PingFang SC;
 							font-weight: 500;
 							color: #FFFFFF;
-							background: #2BC7B9;
+							background: #FC581C;
 							border-radius: 10upx 4upx 10upx 4upx;
 							margin-right: 12upx;
 						}
@@ -444,7 +444,7 @@
 					font-size: 28upx;
 					font-family: PingFang SC;
 					font-weight: 500;
-					color: #2BC7B9;
+					color: #FC581C;
 				}
 				image{
 					width: 14upx;
@@ -485,7 +485,7 @@
 			}
 			&.active{
 				position: relative;
-				border: 2upx solid #2BC7B9;
+				border: 2upx solid #FC581C;
 				.active-img{
 					display: block;
 				}
@@ -507,7 +507,7 @@
 				.price{
 					display: flex;
 					align-items: flex-end;
-					color: #2BC7B9;
+					color: #FC581C;
 					.num{
 						font-size: 30upx;
 						font-weight: bold;
@@ -575,7 +575,7 @@
 			font-family: PingFang SC;
 			font-weight: bold;
 			color: #FFFFFF;
-			background: #2BC7B9;
+			background: #FC581C;
 			border-radius: 44upx;
 			text-align: center;
 		}