add

App.vue

@@ -876,6 +876,16 @@ export default {
 		-webkit-box-orient:vertical;
 		-webkit-line-clamp:2; 
 	}
+	.myotctxt {
+		display: inline-block;
+		background-color: #37E2EA;
+		font-family: PingFang SC, PingFang SC;
+		font-weight: 500;
+		font-size: 24rpx;
+		color: #FFFFFF;
+		padding: 2rpx 14rpx;
+		border-radius: 6rpx;
+	}
 	.no-data-box{
 		box-sizing: border-box;
 		width: 100%;

common/request.js

@@ -6,7 +6,7 @@ export default class Request {
 		// var path=uni.getStorageSync('requestPath')
 
 		var path = 'https://storeuserapp.bjyjbao.com'; //正式
-		// var path = "https://3ce64c10ba0e.ngrok-free.app"
+		// var path = "http://hdb96e3d.natappfree.cc"
 		// var path = "http://q8956b49.natappfree.cc"
 		// var path = "http://192.168.10.126:8113"
 		let token="";

components/medicineItem.vue

@@ -77,15 +77,6 @@
 </script>
 
 <style scoped lang="scss">
-	.myotctxt {
-		background-color: #37E2EA;
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 500;
-		font-size: 24rpx;
-		color: #FFFFFF;
-		padding: 4rpx 14rpx;
-		border-radius: 6rpx;
-	}
 	.pro-name {
 		flex: 1;
 		font-family: PingFang SC, PingFang SC;

pages.json

@@ -1576,6 +1576,15 @@
 						}
 					}
 				},
+				{
+					"path": "order/changePriceOrderList",
+					"style": {
+						"navigationBarTitleText": "实收改价申请",
+						"app-plus": {
+							"titleNView": false
+						}
+					}
+				},
 				{
 					"path": "order/coupon",
 					"style": {

pages_company/alipayImg.vue

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

pages_company/api/companyOrder.js

@@ -26,10 +26,22 @@ let request = new Request().http
  	 return request('/store/app/companyOrder/getSalesOrders',data,'GET' );
  }
  export function addUserCart(data) {
- 	 return request('/store/app/companyOrder/addUserCart',data,'GET' );
+ 	 return request('/store/app/companyOrder/addUserCartMulti',data,'GET' );
  }
  
  export function editOrderMoney(data) {
  	 return request('/store/app/companyOrder/editOrderMoney',data,'GET' );
  }
- 
+ export function changeList(data) {
+ 	 return request('/shop/change/list',data,'GET' );
+ }
+ export function sharePrepare(data) {
+ 	 return request('/shop/change/sharePrepare',data,'POST','application/json;charset=UTF-8');
+ }
+ export function delList(id) {
+ 	 return request('/shop/change/'+id,null,'DELETE' );
+ }
+ 
+ export function changeListDetail(id) {
+ 	return request('/shop/change/'+id,null,'GET' );
+ }

pages_company/auth/login.vue

@@ -125,7 +125,7 @@ export default {
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #2BC7B9;
+				background: #2583EB;
 				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:#2583EB !important;
  		border-radius: 44upx;
  	}
  }

pages_company/coupon.vue

@@ -12,10 +12,10 @@
 			</scroll-view>
 		</view>
 	</view>
-	<!-- <image src="/static/images/banner_coupon.png" mode="widthFix" class="tui-coupon-banner"></image> -->
+	<!-- <image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/banner_coupon.png" mode="widthFix" class="tui-coupon-banner"></image> -->
     <view class="tui-coupon-list">
       <view class="tui-coupon-item tui-top20" v-for="(item, index) in couponsList" :key="index">
-         <image src="/static/images/bg_coupon_3x.png" class="tui-coupon-bg" mode="widthFix"></image>
+         <image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/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>
@@ -49,7 +49,7 @@
 	<Loading :loaded="loadend" :loading="loading"></Loading>
 	<!--暂无优惠券-->
 	<view v-if="couponsList.length == 0 && page > 1" class="no-data-box" >
-		<image src="/static/images/no_data.png" mode="aspectFit"></image>
+		<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/no_data.png" mode="aspectFit"></image>
 		<view class="empty-title">暂无数据</view>
 	</view>
   </view>
@@ -150,15 +150,15 @@ page {
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #2BC7B9;
+			color: #2583EB;
 			background: #F5FFFE;
 			border: 1px solid #8AD5CE;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #2BC7B9;
-				border: 1px solid #2BC7B9;
+				background: #2583EB;
+				border: 1px solid #2583EB;
 			}
 		}
 	}

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="/static/images/bg_coupon_3x.png" class="tui-coupon-bg" mode="widthFix"></image>
+         <image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/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,31 +17,35 @@
 				<view class="title">常用工具</view>
 				<view class="tools-list">
 					<view class="item" @click="toCreateOrder()">
-						<image src="/static/images/order.png" mode=""></image>
+						<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/image/userimg/my_cforder.png" mode=""></image>
 						<text class="text">商品制单</text>
 					</view>
 					<!-- <view class="item" @click="toCreateCoupon()">
-						<image src="/static/images/icon_coupon.png" mode=""></image>
+						<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/icon_coupon.png" mode=""></image>
 						<text class="text">制单优惠券</text>
 					</view> -->
 					<!-- <view class="item" @click="toPay()">
-						<image src="/static/images/money.png" mode=""></image>
+						<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/money.png" mode=""></image>
 						<text class="text">微信收款</text>
 					</view> -->
 					<!-- <view class="item" @click="alipay()">
-						<image src="/static/images/money.png" mode=""></image>
+						<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/money.png" mode=""></image>
 						<text class="text">支付宝收款</text>
 					</view> -->
 					<view class="item" @click="toOrder()">
-						<image src="/static/images/order.png" mode=""></image>
+						<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/image/userimg/my_cforder.png" mode=""></image>
 						<text class="text">我的订单</text>
 					</view>
+					<view class="item" @click="navTo('/pages_company/order/changePriceOrderList')">
+						<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/image/userimg/my_cforder.png" mode=""></image>
+						<text class="text">实收改价申请</text>
+					</view>
 	<!-- 				<view class="item" @click="toPackage()">
-						<image src="/static/images/package.png" mode=""></image>
+						<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/package.png" mode=""></image>
 						<text class="text">商品套餐</text>
 					</view>
 					<view class="item" @click="toCoupon()">
-						<image src="/static/images/icon_coupon.png" mode=""></image>
+						<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/icon_coupon.png" mode=""></image>
 						<text class="text">套餐优惠券</text>
 					</view> -->
 					
@@ -103,6 +107,11 @@
 					url:'/pages_company/storeOrder?companyId='+this.user.companyId+"&companyUserId="+this.user.userId
 				})
 			},
+			navTo(url){
+				uni.navigateTo({
+					url:url
+				})
+			},
 			toPackage(){
 				uni.navigateTo({
 					url:'/pages_company/storeProductPackage?companyId='+this.user.companyId+"&companyUserId="+this.user.userId
@@ -231,7 +240,7 @@
 				font-weight: 500;
 				color: #FFFFFF;
 				border-radius: 8rpx;
-				background-color: #2BC7B9;
+				background-color: #2583EB;
 			}
 		}
 		.used-tools{

pages_company/order/cart.vue

@@ -17,7 +17,7 @@
 					<view class="info-box" @click="handleDetail(item)">
 						<view>
 							<view class="title-box">
-								<view class="tag">{{$getDictLabelName("storeProductType",item.productType)}}</view>
+								<view class="myotctxt" style="margin-right: 10rpx;" :style="{background:_background(item.productType)}">{{$getDictLabelName("storeProductType",item.productType)}}</view>
 								<view class="title ellipsis">{{ item.commonName&&item.commonName!=='-'?item.commonName:item.productName }}</view>
 							</view>
 							<view class="intro ellipsis">{{item.productAttrName}}</view>
@@ -91,6 +91,20 @@
 				checkAll:false,
 			}	
 		},
+		computed: {
+			_background() {
+				//productType： 1：OTC，2：Rx，3：非药品，4：器械
+				return (productType)=> {
+					switch (productType) {
+						case 1: return '#37E2EA' // OTC
+						case 2: return 'red'     // Rx
+						case 3: return '#2583EB' // 非药品
+						case 4: return '#999'    // 器械
+						default: return '#ccc'
+					}
+				}
+			}
+		},
 		onShow() {
 			this.getCarts();
 		},

pages_company/order/changePriceOrderList.vue

@@ -0,0 +1,340 @@
+<template>
+	<view>
+		<view class="top-fixed">
+			<!-- tab切换 -->
+			<view class="pub-tab-box">
+				<u-tabs :current="current" :list="listStatus" :scrollable="false" @change="listStatusChange"></u-tabs>
+			</view>
+			<view class="search-cont">
+				<view class="inner">
+					<image class="icon-search" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/icon_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>
+		</view>
+		<mescroll-body top="100px" ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption" :up="upOption">
+			<view class="order-list">
+				<view  v-for="(item,index) in dataList" :key="index" class="item" >
+					<view class="ordersn-box" @click="showDetail(item)">
+						<view class="num">创建时间：{{item.createTime}}</view>
+						<view class="status-box">
+							<text class="text success" v-show="item.auditStatus==1">
+								审核中
+							</text>
+							<text class="text info" v-show="item.auditStatus==0">
+								待审核
+							</text>
+							<text class="text success" v-show="item.auditStatus==2">
+								已通过
+							</text>
+							<text class="text black" v-show="item.auditStatus==-1">
+								驳回
+							</text>
+						</view>
+					</view>
+					<view class="name-box">{{item.matchedProducts}}</view>
+					<view class="amount-paid mt16" v-if="item.auditRemark&&item.auditStatus==-1">
+						<text class="label">驳回原因：</text>
+						<text style="font-size: 28rpx;">{{item.auditRemark||''}}</text>
+					</view>
+					<view class="amount-paid mt16">
+						<text class="label">物流代收自定义金额：</text>
+						<view class="price-box">
+							<view class="unit">¥</view>
+							<view class="num" >{{item.payAmount.toFixed(2)}}</view>
+						</view>
+					</view>
+					<view class="bottom-box">
+						<view class="amount-paid">
+							<text class="label">支付金额：</text>
+							<view class="price-box">
+								<view class="unit">¥</view>
+								<view class="num" >{{item.money.toFixed(2)}}</view>
+							</view>
+						</view>
+						<view class="btn-box">
+							<view class="btn pay" v-if="item.auditStatus==2" @click="handleDetail(item)">查看详情</view>
+							<view class="btn cancel" v-if="item.auditStatus==0||item.auditStatus==-1" @click="handleDel(item)">删除</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</mescroll-body>
+	</view>
+</template>
+
+<script>
+	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+	import { changeList,delList } from '../api/companyOrder.js'
+	export default {
+		mixins: [MescrollMixin], 
+		data() {
+			return {
+				listStatus: [
+					{name:"审核中",value:"1"},
+					{name:"待审核",value:"0"},
+					{name:"已通过",value:"2"},
+					{name:"驳回",value:"-1"}
+				],
+				status: 1,
+				current: 0,
+				mescroll:null,
+				downOption: {
+					//下拉刷新
+					use: true,
+					auto: false // 不自动加载 (mixin已处理第一个tab触发downCallback)
+				},
+				// 上拉加载的配置
+				upOption: {
+					onScroll:true,
+					use: true, // 是否启用上拉加载; 默认true
+					page: {
+						num: 0, // 当前页码,默认0,回调之前会加1,即callback(page)会从1开始
+						size: 10 // 每页数据的数量,默认10
+					},
+					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
+					empty: {
+						icon:'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/empty_icon.png',
+						tip: '暂无数据'
+					}
+				},
+				// 列表数据
+				dataList: [],
+				searchKey: ''
+			}
+		},
+		methods: {
+			listStatusChange(e) {
+				this.current = e.index
+				this.status = e.value
+				this.mescroll.resetUpScroll()
+			},
+			goSearch() {
+				this.searchKey=e.detail.value;
+				this.mescroll.resetUpScroll()
+			},
+			mescrollInit(mescroll) {
+				this.mescroll = mescroll;
+			},
+			/*下拉刷新的回调 */
+			downCallback(mescroll) {
+				mescroll.resetUpScroll()
+			},
+			upCallback(page) {
+				//联网加载数据
+				var that = this;
+				var data = {
+					matchedProducts:this.searchKey,
+					auditStatus:this.status,
+					page: page.num,
+					pageSize: page.size,
+					token:uni.getStorageSync('CompanyUserToken')
+				};
+				changeList(data).then(res => {
+					if(res.code==200){
+						//设置列表数据
+						if (page.num == 1) {
+							that.dataList = res.data.list; 
+							
+						} else {
+							that.dataList = that.dataList.concat(res.data.list);
+							 
+						}
+						that.mescroll.endBySize(res.data.list.length, res.data.total);
+						
+					}else{
+						uni.showToast({
+							icon:'none',
+							title: "请求失败",
+						});
+						that.dataList = null;
+						that.mescroll.endErr();
+					}
+				});
+			},
+			handleDetail(item) {
+				uni.navigateTo({
+					url: '/pages_company/order/confirmCompanyOrder?source=audit&auditId='+item.id
+				})
+			},
+			handleDel(item) {
+				let that = this
+				uni.showModal({
+					title: '提示',
+					content: '确定删除该申请吗？',
+					success: function (res) {
+						if (res.confirm) {
+							delList(item.id).then(res=>{
+								if(res.code == 200) {
+									uni.showToast({
+										icon:'none',
+										title: '删除成功',
+									});
+									that.mescroll.resetUpScroll();
+								} else {
+									uni.showToast({
+										icon:'none',
+										title: res.msg,
+									});
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.top-fixed{
+		width: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 10;
+	}
+	.pub-tab-box{
+		box-sizing: border-box;
+		width: 100%;
+		padding: 0 40upx;
+		background-color: #FFFFFF;
+	}
+	.search-cont{
+		padding: 16upx 30upx;
+		background-color: #FFFFFF;
+		.inner{
+			box-sizing: border-box;
+			width: 100%;
+			height: 72upx;
+			background: #F7F7F7;
+			border-radius: 36upx;
+			display: flex;
+			align-items: center;
+			padding: 0 30upx;
+			.icon-search{
+				width: 28upx;
+				height: 28upx;
+				margin-right: 20upx;
+			}
+			input{
+				height: 60upx;
+				line-height: 60upx;
+				flex: 1;
+			}
+		}
+	}
+	.order-list{
+		padding: 20upx;
+		.item{
+			background: #FFFFFF;
+			border-radius: 16upx;
+			padding: 0 30upx;
+			margin-bottom: 20upx;
+			.ordersn-box{
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding: 34upx 0 20upx;
+				.num{
+					font-size: 26upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+					line-height: 1;
+				}
+				.status-box{
+					display: flex;
+					align-items: center;
+					.text{
+						font-size: 28upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						line-height: 1;
+						&.success{
+							color: #2583EB;
+						}
+						&.black{
+							color: #111111;
+						}
+						&.info{
+							color: #999999;
+						}
+					}
+				}
+			}
+		}
+	}
+	.name-box {
+		font-size: 32upx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #111111;
+		line-height: 40upx;
+	}
+	.amount-paid{
+		display: flex;
+		align-items: center;
+		.label{
+			font-size: 24upx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #999999;
+			line-height: 1;
+		}
+		.price-box{
+			display: flex;
+			align-items: flex-end;
+			.unit{
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FF6633;
+				line-height: 1.2;
+				margin-right: 4upx;
+			}
+			.num{
+				font-size: 32upx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #FF6633;
+				line-height: 1;
+			}
+		}
+	}
+	.bottom-box{
+		height: 110upx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		.btn-box{
+			box-sizing: border-box;
+			display: flex;
+			align-items: center;
+			.btn{
+				width: 155upx;
+				height: 64upx;
+				line-height: 64upx;
+				font-size: 26upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				text-align: center;
+				border-radius: 32upx;
+				margin-left: 15upx;
+				&:first-child{
+					margin-left: 0;
+				}
+				&.cancel{
+					border: 1px solid #DDDDDD;
+					color: #666666;
+				}
+				&.pay{
+					background: #2583EB;
+					color: #FFFFFF;
+				}
+			}
+		}
+	}
+</style>

pages_company/order/confirmCompanyOrder.vue

@@ -5,19 +5,20 @@
 			<view class="goods-list">
 				<view v-for="(item,index) in carts" :key="index" class="item" @click="showDetail(item)">
 					<view class="img-box">
-						<image :src="item.productAttrImage!=null?item.productAttrImage:item.productImage" mode="aspectFill"></image>
+						<image :src="source=='audit'?item.image : item.productAttrImage||item.productImage" mode="aspectFill"></image>
 					</view>
 					<view class="info-box">
 						<view>
 							<view class="name-box ellipsis2">
-								<view class="tag">{{$getDictLabelName("storeProductType",item.productType)}}</view>{{item.productName}}
+								<view class="myotctxt" style="margin-right: 10rpx;" v-show="item.productType" :style="{background:_background(item.productType)}">{{$getDictLabelName("storeProductType",item.productType)}}</view>
+								{{ item.commonName&&item.commonName!=='-'?item.commonName:item.productName }}
 							</view>
 							<view class="spec ellipsis2">{{item.productAttrName}}</view>
 						</view>
 						<view class="price-num">
 							<view class="price">
 								<text class="unit">¥</text>
-								<text class="num">{{item.price.toFixed(2)}}</text>
+								<text class="num">{{item.price?item.price.toFixed(2):'0.00'}}</text>
 							</view>
 							<view class="num">x{{item.cartNum}}</view>
 						</view>
@@ -28,7 +29,7 @@
 					<text class="label">合计金额：</text>
 					<view class="price">
 						<text class="unit">¥</text>
-						<text class="num">{{price.payPrice.toFixed(2)}}</text>
+						<text class="num">{{price.payPrice?price.payPrice.toFixed(2):'0.00'}}</text>
 					</view>
 				</view>
 			</view>
@@ -41,13 +42,13 @@
 					<text class="label">总金额：</text>
 					<view class="price">
 						<text class="unit">¥</text>
-						<text class="num">{{price.totalPrice.toFixed(2)}}</text>
+						<text class="num">{{price.totalPrice?price.totalPrice.toFixed(2):'0.00'}}</text>
 					</view>
 				</view>
-				<!-- <view class="btn" @click="openUpdateMoney()" >
+				<view class="btn" @click="openUpdateMoney()" v-if="source!='audit'">
 					实收金额
-				</view> -->
-				<view class="btn">
+				</view>
+				<view class="btn" v-show="!disabled">
 					分享
 					<button  class="share" data-name="shareBtn" open-type="share">分享</button>
 				</view>
@@ -60,7 +61,7 @@
 </template>
 
 <script>
-	import {getSalesOrder,getSalesOrders,updateSaleOrderMoney} from '../api/companyOrder.js'
+	import {getSalesOrder,getSalesOrders,updateSalseOrderMoney,sharePrepare,changeListDetail} from '../api/companyOrder.js'
 	export default {
 		data() {
 			return {
@@ -72,13 +73,38 @@
 					totalPrice:0.00,
 				},
 				carts:[],
-				
+				disabled: false,
+				source:'', // audit审核页过来的
+				auditId:''
+			}
+		},
+		computed: {
+			_background() {
+				//productType： 1：OTC，2：Rx，3：非药品，4：器械
+				return (productType)=> {
+					switch (productType) {
+						case 1: return '#37E2EA' // OTC
+						case 2: return 'red'     // Rx
+						case 3: return '#2583EB' // 非药品
+						case 4: return '#999'    // 器械
+						default: return '#ccc'
+					}
+				}
 			}
 		},
 		onLoad(option) {
-			this.orderKey=option.orderKey;
-			this.getSalesOrder();
-			 
+			this.source = option.source || ''
+			if(this.source == 'audit') {
+				uni.hideShareMenu()
+				this.disabled = true
+				this.auditId = option.auditId || ''
+				this.sharePrepare()
+				this.getDetail()
+			} else {
+				this.orderKey=option.orderKey;
+				uni.showShareMenu()
+				this.getSalesOrder();
+			} 
 		},
 		//发送给朋友
 		onShareAppMessage(res) {
@@ -91,7 +117,21 @@
 		},
 		methods: {
 			openUpdateMoney(){
-				console.log(1)
+				if(this.disabled) {
+					uni.showModal({
+						title: '提示',
+						content: '✅ 实收金额改价申请审核中！',
+						showCancel: false,
+						success: function (res) {
+							if (res.confirm) {
+								console.log('用户点击确认');
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+					return
+				}
 				this.inputShow = true
 			},
 			cancelUpdateMoney(){
@@ -99,38 +139,31 @@
 			},
 			confirmUpdateMoney(){
 				if(parseFloat(this.inputTxt)>0){
-					// var that=this;
-					// var data={createOrderKey:this.orderKey,token:uni.getStorageSync('CompanyUserToken'),money:this.inputTxt}
-					// updateSalseOrderMoney(data).then(
-					// 	res => {
-					// 		if(res.code==200){
-					// 			this.inputShow = false
-					// 			this.getSalesOrder();
-					// 		}else{
-					// 			uni.showToast({
-					// 				icon:'none',
-					// 				title: res.msg,
-					// 			});
-					// 		}
-					// 	},
-					// 	rej => {}
-					// );
-					// 多店铺修改实付金额
-					const param = {
-						token:uni.getStorageSync('CompanyUserToken'),
-						vos: this.carts.map(item => ({
-							createOrderKey: item.createOrderKey, // 购物车id
-							totalPrice: item.totalMoney,//原价
-							payPrice: item.createOrderKey == this.chooseOrderKey ? Number(this.inputTxt || 0) : item.payMoney//实收价
-						}))
-					}
-					console.log(param)
-					updateSaleOrderMoney(param).then(res => {
+					var that=this;
+					var data={totalAmount: this.price.totalPrice,createOrderKey:this.orderKey,token:uni.getStorageSync('CompanyUserToken'),money:this.inputTxt}
+					updateSalseOrderMoney(data).then(
+						res => {
 							if(res.code==200){
-								this.chooseOrderKey = ""
-								this.idx = 0
+								this.disabled = res.disabled
+								if(this.disabled) {
+									uni.hideShareMenu()
+								} else {
+									uni.showShareMenu()
+								}
 								this.inputShow = false
 								this.getSalesOrder();
+								uni.showModal({
+									title: '提示',
+									content: '✅ 实收金额改价申请已提交！',
+									showCancel: false,
+									success: function (res) {
+										if (res.confirm) {
+											uni.navigateBack()
+										} else if (res.cancel) {
+											console.log('用户点击取消');
+										}
+									}
+								});
 							}else{
 								uni.showToast({
 									icon:'none',
@@ -163,7 +196,6 @@
 						if(res.code==200){
 							this.carts=res.carts;
 							this.carts.forEach(function(element) {
-								// that.price.totalPrice += element.payMoney;
 								that.price.payPrice+=element.price*element.cartNum;
 							});
 							that.price.totalPrice=res.totalMoney
@@ -178,7 +210,39 @@
 					rej => {}
 				);
 			},
-			 
+			sharePrepare() {
+				const param = {
+					token:uni.getStorageSync('CompanyUserToken'),
+					id:this.auditId,
+				}
+				sharePrepare(param).then(res=>{
+					if(res.code==200) {
+						uni.showShareMenu()
+						this.disabled = false
+					} else {
+						uni.showToast({
+							icon:'none',
+							title: res.msg,
+						});
+					}
+				})
+			},
+			getDetail() {
+				let that = this
+				changeListDetail(this.auditId).then(res=>{
+					if(res.code==200){
+						that.carts=res.data.preparedProductInfoVoList;
+						that.price.payPrice = res.data.totalAmount
+						that.price.totalPrice=res.data.money
+						that.orderKey = res.data.createOrderKey
+					}else{
+						uni.showToast({
+							icon:'none',
+							title: res.msg,
+						});
+					}
+				})
+			}
 		}
 	}
 </script>
@@ -218,21 +282,6 @@
 						font-weight: 500;
 						color: #111111;
 						line-height: 40upx;
-						.tag{
-							display: inline-block;
-							padding: 0 6upx;
-							height: 30upx;
-							background: linear-gradient(90deg, #2BC7B9 0%, #2BC7A4 100%);
-							border-radius: 4upx;
-							margin-right: 10upx;
-							font-size: 22upx;
-							font-family: PingFang SC;
-							font-weight: bold;
-							color: #FFFFFF;
-							line-height: 30upx;
-							float: left;
-							margin-top: 7upx;
-						}
 					}
 					.spec{
 						margin-top: 10upx;
@@ -428,7 +477,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #2BC7B9;
+				background: #2583EB;
 				border-radius: 44upx;
 				position: relative;
 				.share{

pages_company/order/confirmOrder.vue

@@ -10,7 +10,7 @@
 					<view class="info-box">
 						<view>
 							<view class="name-box ellipsis2">
-								<view class="tag">{{$getDictLabelName("storeProductType",item.productType)}}</view>{{item.productName}}
+								<view class="myotctxt" style="margin-right: 10rpx;" :style="{background:_background(item.productType)}">{{$getDictLabelName("storeProductType",item.productType)}}</view>{{ item.commonName&&item.commonName!=='-'?item.commonName:item.productName }}
 							</view>
 							<view class="spec ellipsis2">{{item.productAttrName}}</view>
 						</view>
@@ -223,7 +223,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #66b2ef 0%, #2BC7B9 100%);
+							background: linear-gradient(90deg, #66b2ef 0%, #2583EB 100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -429,7 +429,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #2BC7B9;
+				background: #2583EB;
 				border-radius: 44upx;
 			}
 		}
@@ -550,7 +550,7 @@
 				font-size: 28upx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #2BC7B9;
+				color: #2583EB;
 			}
 		}
 		.btn{
@@ -563,7 +563,7 @@
 			font-weight: 500;
 			color: #FFFFFF;
 			border: 1px solid #D2E6FF;
-			background: linear-gradient(135deg, #66b2ef 0%, #2BC7B9 100%);
+			background: linear-gradient(135deg, #66b2ef 0%, #2583EB 100%);
 			border-radius: 24upx;
 			margin-left: 30upx;
 		}

pages_company/order/coupon.vue

@@ -2,13 +2,13 @@
   <view ref="container">
 	<view class="search-cont">
 		<view class="inner">
-			<image class="icon-search" src="/static/images/search.png" mode=""></image>
+			<image class="icon-search" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/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>
     <view class="tui-coupon-list">
       <view class="tui-coupon-item tui-top20" v-for="(item, index) in couponsList" :key="index">
-         <image src="/static/images/bg_coupon_3x.png" class="tui-coupon-bg" mode="widthFix"></image>
+         <image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/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>
@@ -42,7 +42,7 @@
 	<Loading :loaded="loadend" :loading="loading"></Loading>
 	<!--暂无优惠券-->
 	<view v-if="couponsList.length == 0 && page > 1" class="no-data-box" >
-		<image src="/static/images/no_data.png" mode="aspectFit"></image>
+		<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/no_data.png" mode="aspectFit"></image>
 		<view class="empty-title">暂无数据</view>
 	</view>
   </view>

pages_company/order/productList.vue

@@ -76,7 +76,7 @@
 						<view class="otctxt" :style="{background:_background(item.productType)}" v-show="item.productType">{{$getDictLabelName("storeProductType",item.productType)}}</view>
 					</view>
 					<view class="info-box">
-						<view class="title ellipsis2">{{item.productName}}</view>
+						<view class="title ellipsis2">{{item.commonName&&item.commonName!=='-'?item.commonName:item.productName}}</view>
 						<view class="price-box">
 							<view class="now">
 								<text class="unit">¥</text>

pages_company/storeOrder.vue

@@ -29,7 +29,8 @@
 							<view class="drug-info"  >
 								<view>
 									<view class="name-box ellipsis2">
-										<view v-if="subItem.isPrescribe==1" class="tag">处方药</view>{{JSON.parse(subItem.jsonInfo).productName}}
+										<view v-if="subItem.isPrescribe==1" class="tag">Rx</view>
+										{{JSON.parse(subItem.jsonInfo).commonName&&JSON.parse(subItem.jsonInfo).commonName!=='-'?JSON.parse(subItem.jsonInfo).commonName:JSON.parse(subItem.jsonInfo).productName}}
 									</view>
 									<view class="spec">{{JSON.parse(subItem.jsonInfo).sku}}</view>
 								</view>
@@ -262,7 +263,7 @@
 						font-weight: 500;
 						line-height: 1;
 						&.success{
-							color: #2BC7B9;
+							color: #2583EB;
 						}
 						&.black{
 							color: #111111;
@@ -305,7 +306,7 @@
 								display: inline-block;
 								padding: 0 6upx;
 								height: 30upx;
-								background: linear-gradient(90deg, #2BC7B9 0%, #2BC7A4 100%);
+								background: red;
 								border-radius: 4upx;
 								margin-right: 10upx;
 								font-size: 22upx;
@@ -415,7 +416,7 @@
 								color: #666666;
 							}
 							&.pay{
-								background: #2BC7B9;
+								background: #2583EB;
 								color: #FFFFFF;
 								position: relative;
 								.share{

pages_company/storeOrderDetail.vue

@@ -2,13 +2,13 @@
 	<view>
 		<view class="top-cont">
 			<!-- 背景图片 -->
-			<image class="bg" src="/static/images/order_top_bg.png" mode=""></image>
+			<view class="bg-color"></view>
 			<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="/static/images/back_white.png" mode=""></image>
+						<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/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="/static/images/pag96.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/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="/static/images/pag96.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/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="/static/images/receipt.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/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="/static/images/finish96.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/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="/static/images/close_trade.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/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="/static/images/close_trade.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/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="/static/images/close_trade.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/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="/static/images/location.png" mode=""></image>
+						<image class="location" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/location.png" mode=""></image>
 						<view class="info">
 							<view class="name-phone">
 								<text class="text">{{order.realName}}</text>
@@ -115,7 +115,8 @@
 							<view class="info-box">
 								<view>
 									<view class="name-box ellipsis2">
-										<view v-if="item.isPrescribe==1" class="tag">处方药</view>{{JSON.parse(item.jsonInfo).productName}}
+										<view v-if="item.isPrescribe==1" class="tag">Rx</view>
+										{{JSON.parse(item.jsonInfo).commonName&&JSON.parse(item.jsonInfo).commonName!=='-'?JSON.parse(item.jsonInfo).commonName:JSON.parse(item.jsonInfo).productName}}
 									</view>
 									<view class="spec">{{JSON.parse(item.jsonInfo).sku}}</view>
 								</view>
@@ -206,7 +207,7 @@
 							<text class="label">电子处方</text>
 							<view class="check-box" @click="showImg()">
 								<text class="text">查看</text>
-								<image src="/static/images/arrow4.png" mode=""></image>
+								<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/arrow4.png" mode=""></image>
 							</view>
 						</view>
 					</view>
@@ -371,9 +372,14 @@
 </script>
 
 <style lang="scss">
+	.bg-color {
+		width: 100%;
+		background: linear-gradient(to right, #2583EB 0%, #60CDC3 100%);
+		height: 450rpx;
+	}
 	.fixed-top-box{
 		width: 100%;
-		background: linear-gradient(135deg, #2BC7B9 0%, #60CDC3 100%);
+		background: linear-gradient(to right, #2583EB 0%, #60CDC3 100%);
 		position: fixed;
 		top: 0;
 		left: 0;
@@ -541,7 +547,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #2BC7B9 0%, #2BC7A4 100%);
+							background: red;
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -732,7 +738,7 @@
 			border-radius: 32upx;
 			margin-left: 15upx;
 			&.share-btn{
-				background: #2BC7B9;
+				background: #2583EB;
 				color: #FFFFFF;
 				position: relative;
 				.share{
@@ -833,7 +839,7 @@
 					font-family: PingFang SC;
 					font-weight: bold;
 					color: #FFFFFF;
-					background: #2BC7B9;
+					background: #2583EB;
 					border-radius: 44upx;
 				}
 			}

pages_order/prescribeList.vue

@@ -193,7 +193,7 @@
 					color: #666666;
 				}
 				&.pay{
-					background: #2BC7B9;
+					background: #2583EB;
 					color: #FFFFFF;
 				}
 			}

pages_order/storeOrderRefundDetails.vue

@@ -260,7 +260,7 @@
 <style lang="scss">
 	.fixed-top-box{
 		width: 100%;
-		background: linear-gradient(135deg, #2583EB 0%, #60CDC3 100%);
+		background: linear-gradient(to right, #2583EB 0%, #60CDC3 100%);
 		position: fixed;
 		top: 0;
 		left: 0;

pages_shopping/cart.vue

@@ -17,7 +17,7 @@
 					<view class="info-box" @click="handleDetail(item)">
 						<view>
 							<view class="title-box">
-								<view class="tag">{{$getDictLabelName("storeProductType",item.productType)}}</view>
+								<view class="myotctxt" style="margin-right: 10rpx;" :style="{background:_background(item.productType)}">{{$getDictLabelName("storeProductType",item.productType)}}</view>
 								<view class="title ellipsis">{{ item.commonName&&item.commonName!=='-'?item.commonName:item.productName }}</view>
 							</view>
 							<view class="intro ellipsis">{{item.productAttrName}}</view>
@@ -90,6 +90,20 @@
 				checkAll:false,
 			}	
 		},
+		computed: {
+			_background() {
+				//productType： 1：OTC，2：Rx，3：非药品，4：器械
+				return (productType)=> {
+					switch (productType) {
+						case 1: return '#37E2EA' // OTC
+						case 2: return 'red'     // Rx
+						case 3: return '#2583EB' // 非药品
+						case 4: return '#999'    // 器械
+						default: return '#ccc'
+					}
+				}
+			}
+		},
 		onShow() {
 			this.getCarts();
 		},

pages_shopping/evaluateDetail.vue

@@ -294,7 +294,7 @@
 						display: inline-block;
 						padding: 0 6upx;
 						height: 30upx;
-						background: linear-gradient(90deg, #2BC7B9 0%, #2BC7A4 100%);
+						background: linear-gradient(90deg, #2583EB 0%, #2BC7A4 100%);
 						border-radius: 4upx;
 						margin-right: 10upx;
 						font-size: 22upx;

pages_shopping/home/productList.vue

@@ -75,7 +75,7 @@
 						<view class="otctxt" :style="{background:_background(item.productType)}" v-show="item.productType">{{$getDictLabelName("storeProductType",item.productType)}}</view>
 					</view>
 					<view class="info-box">
-						<view class="title ellipsis2">{{item.productName}}</view>
+						<view class="title ellipsis2">{{item.commonName&&item.commonName!=='-'?item.commonName:item.productName}}</view>
 						<view class="price-box">
 							<view class="now">
 								<text class="unit">¥</text>

pages_shopping/prescribe.vue

@@ -646,7 +646,7 @@
 		justify-content: space-between;
 		.fixed-top-box{
 			width: 100%;
-			background: linear-gradient(135deg, #2583EB 0%, #60CDC3 100%);
+			background: linear-gradient(to right, #2583EB 0%, #60CDC3 100%);
 			position: fixed;
 			top: 0;
 			left: 0;

pages_shopping/user/otherPaySuccess.vue

@@ -3,7 +3,7 @@
 		<view class="inner">
 			<view class="top">
 				<text class="title">支付成功</text>
-				<image class="icon" src="/static/images/success.png" ></image>
+				<image class="icon" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/success.png" ></image>
 				<view   class="btn-box">
 					<view class="btn cancel" @click="goBack()"> 返回首页</view>
 				</view>

pages_user/complaint.vue

@@ -724,7 +724,7 @@
 					font-weight: 500;
 					line-height: 1;
 					&.success{
-						color: #2BC7B9;
+						color: #2583EB;
 					}
 					&.black{
 						color: #111111;
@@ -767,7 +767,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #2BC7B9 0%, #2BC7A4 100%);
+							background: linear-gradient(90deg, #2583EB 0%, #2BC7A4 100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;

pages_user/complaintList.vue

@@ -43,7 +43,7 @@
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					textNoMore: '没有更多了', 
 					empty: {
-						icon:'/static/images/no_data.png',
+						icon:'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/no_data.png',
 						tip: '暂无数据'
 					}
 				},

pages_user/shopping/paymentOrderRemain.vue

@@ -369,7 +369,7 @@
 				font-weight: bold;
 				color: #FFFFFF;
 				text-align: center;
-				background: #2BC7B9;
+				background: #2583EB;
 				border-radius: 44upx;
 				margin-bottom: 10rpx;
 			}
@@ -380,8 +380,8 @@
 				font-size: 30upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #2BC7B9;
-				border: 1rpx solid #2BC7B9;
+				color: #2583EB;
+				border: 1rpx solid #2583EB;
 				text-align: center;
 				background: #FFFFFF;
 				border-radius: 44upx;

pages_user/shopping/refundOrder.vue

@@ -229,7 +229,7 @@
 										display: inline-block;
 										padding: 0 6upx;
 										height: 30upx;
-										background: linear-gradient(90deg, #2BC7B9 0%, #2BC7A4 100%);
+										background: linear-gradient(90deg, #2583EB 0%, #2BC7A4 100%);
 										border-radius: 4upx;
 										margin-right: 10upx;
 										font-size: 22upx;
@@ -472,7 +472,7 @@
 			font-family: PingFang SC;
 			font-weight: bold;
 			color: #FFFFFF;
-			background: #2BC7B9;
+			background: #2583EB;
 			border-radius: 44upx;
 		}
 	}

pages_user/shopping/refundOrderDelivery.vue

@@ -138,7 +138,7 @@ export default {
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #2BC7B9;
+				background: #2583EB;
 				border-radius: 44upx;
 			}
 		}

pages_user/shopping/refundOrderDetail.vue

@@ -2,13 +2,14 @@
 	<view>
 		<view class="top-cont">
 			<!-- 背景图片 -->
-			<image class="bg" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/shopping/order_top_bg.png" mode=""></image>
+			<view class="bg-color"></view>
+			<!-- <image class="bg" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/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://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/shopping/back_white.png" mode=""></image>
+						<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/back_white.png" mode=""></image>
 						<text class="title">售后详情</text>
 						<text></text>
 					</view>
@@ -23,7 +24,7 @@
 					<!-- 处理中 -->
 					<view  v-if="sales.salesStatus == 0" class="inner">
 						<view class="img-box">
-							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/shopping/deal96.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/deal96.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">售后中</text>
@@ -32,7 +33,7 @@
 					</view>
 					<view  v-if="sales.salesStatus == 1" class="inner">
 						<view class="img-box">
-							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/shopping/close_trade.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/close_trade.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">售后取消</text>
@@ -41,7 +42,7 @@
 					</view>
 					<view  v-if="sales.salesStatus == 2" class="inner">
 						<view class="img-box">
-							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/shopping/close_trade.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/close_trade.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">售后取消</text>
@@ -51,7 +52,7 @@
 					<!-- 退款成功 -->
 					<view  v-if="sales.salesStatus == 3" class="inner">
 						<view class="img-box">
-							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/shopping/compel96.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/compel96.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">退款成功</text>
@@ -268,9 +269,14 @@
 </script>
 
 <style lang="scss">
+	.bg-color {
+		width: 100%;
+		background: linear-gradient(to right, #2583EB 0%, #60CDC3 100%);
+		height: 450rpx;
+	}
 	.fixed-top-box{
 		width: 100%;
-		background: linear-gradient(135deg, #2BC7B9 0%, #60CDC3 100%);
+		background: linear-gradient(to right, #2583EB 0%, #60CDC3 100%);
 		position: fixed;
 		top: 0;
 		left: 0;
@@ -500,7 +506,7 @@
 								display: inline-block;
 								padding: 0 6upx;
 								height: 30upx;
-								background: linear-gradient(90deg, #2BC7B9 0%, #2BC7A4 100%);
+								background: linear-gradient(90deg, #2583EB 0%, #2BC7A4 100%);
 								border-radius: 4upx;
 								margin-right: 10upx;
 								font-size: 22upx;

pages_user/shopping/refundOrderList.vue

@@ -272,7 +272,7 @@
 						font-weight: 500;
 						line-height: 1;
 						&.success{
-							color: #2BC7B9;
+							color: #2583EB;
 						}
 						&.info{
 							color: #999999;
@@ -312,7 +312,7 @@
 								display: inline-block;
 								padding: 0 6upx;
 								height: 30upx;
-								background: linear-gradient(90deg, #2BC7B9 0%, #2BC7A4 100%);
+								background: linear-gradient(90deg, #2583EB 0%, #2BC7A4 100%);
 								border-radius: 4upx;
 								margin-right: 10upx;
 								font-size: 22upx;
@@ -414,7 +414,7 @@
 							text-align: center;
 							border-radius: 32upx;
 							&.pay{
-								background: #2BC7B9;
+								background: #2583EB;
 								color: #FFFFFF;
 							}
 						}

pages_user/shopping/refundOrderLogs.vue

@@ -2,7 +2,8 @@
 	<view>
 		<view class="top-cont">
 			<!-- 背景图片 -->
-			<image class="bg" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/shopping/order_top_bg.png" mode=""></image>
+			<view class="bg-color"></view>
+			<!-- <image class="bg" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/shopping/order_top_bg.png" mode=""></image> -->
 			<view class="top-inner">			
 				<!-- 这里是状态栏 -->
 				<view class="status_bar" :style="{height: statusBarHeight}"></view>
@@ -89,7 +90,11 @@
 </script>
 
 <style lang="scss">
- 
+ .bg-color {
+ 	width: 100%;
+ 	background: linear-gradient(to right, #2583EB 0%, #60CDC3 100%);
+ 	height: 450rpx;
+ }
 	.top-cont{
 		width: 100%;
 		height: 476upx;
@@ -289,7 +294,7 @@
 						top: 16upx;
 						z-index: 10;
 						&.active{
-							background-color: #2BC7B9;
+							background-color: #2583EB;
 						}
 					}
 					.img{

pages_user/shopping/refundOrderProduct.vue

@@ -148,7 +148,7 @@
 									display: inline-block;
 									padding: 0 6upx;
 									height: 30upx;
-									background: linear-gradient(90deg, #2BC7B9 0%, #2BC7A4 100%);
+									background: linear-gradient(90deg, #2583EB 0%, #2BC7A4 100%);
 									border-radius: 4upx;
 									margin-right: 10upx;
 									font-size: 22upx;

pages_user/shopping/storeOrder.vue

@@ -50,7 +50,7 @@
 							<view class="drug-info" >
 								<view>
 									<view class="name-box ellipsis2">
-										<view v-if="subItem.isPrescribe==1" class="tag">处方药</view>
+										<view v-if="subItem.isPrescribe==1" class="tag">Rx</view>
 										{{JSON.parse(subItem.jsonInfo).commonName&&JSON.parse(subItem.jsonInfo).commonName!=='-'?JSON.parse(subItem.jsonInfo).commonName:JSON.parse(subItem.jsonInfo).productName}}
 									</view>
 									<view class="spec ellipsis2">{{JSON.parse(subItem.jsonInfo).sku}}</view>
@@ -424,7 +424,7 @@
 						font-weight: 500;
 						line-height: 1;
 						&.success{
-							color: #2BC7B9;
+							color: #2583EB;
 						}
 						&.black{
 							color: #111111;
@@ -467,7 +467,7 @@
 								display: inline-block;
 								padding: 0 6upx;
 								height: 30upx;
-								background: linear-gradient(90deg, #2BC7B9 0%, #2BC7A4 100%);
+								background: red;
 								border-radius: 4upx;
 								margin-right: 10upx;
 								font-size: 22upx;
@@ -577,7 +577,7 @@
 								color: #666666;
 							}
 							&.pay{
-								background: #2BC7B9;
+								background: #2583EB;
 								color: #FFFFFF;
 							}
 						}

pages_user/shopping/storeOrderDelivery.vue

@@ -264,7 +264,7 @@
 						top: 11upx;
 						z-index: 10;
 						&.active{
-							background-color: #2BC7B9;
+							background-color: #2583EB;
 						}
 					}
 					.img{
@@ -287,7 +287,7 @@
 						font-size: 28upx;
 						font-family: PingFang SC;
 						font-weight: 500;
-						color: #2BC7B9;
+						color: #2583EB;
 						line-height: 1.6;
 					}
 				}

pages_user/shopping/storeOrderDetail.vue

@@ -2,13 +2,14 @@
 	<view>
 		<view class="top-cont">
 			<!-- 背景图片 -->
-			<image class="bg" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/shopping/order_top_bg.png" mode=""></image>
+			<view class="bg-color"></view>
+			<!-- <image class="bg" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/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://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/shopping/back_white.png" mode=""></image>
+						<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/back_white.png" mode=""></image>
 						<text class="title">订单详情</text>
 						<text></text>
 					</view>
@@ -23,7 +24,7 @@
 					<!-- 待付款 -->
 					<view v-if="order.status == 0" class="inner">
 						<view class="img-box">
-							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/shopping/pag96.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/pag96.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">待付款</text>
@@ -33,7 +34,7 @@
 					<!-- 待发货 -->
 					<view v-if="order.status == 1" class="inner">
 						<view class="img-box">
-							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/shopping/pag96.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/pag96.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">待发货</text>
@@ -43,7 +44,7 @@
 					<!-- 已发货、待收货 -->
 					<view v-if="order.status == 2" class="inner">
 						<view class="img-box">
-							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/shopping/receipt.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/receipt.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">待收货</text>
@@ -53,7 +54,7 @@
 					<!-- 已完成 -->
 					<view v-if="order.status == 3||order.status == 4" class="inner">
 						<view class="img-box">
-							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/shopping/finish96.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/finish96.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">已完成</text>
@@ -63,7 +64,7 @@
 					<!--交易取消 -->
 					<view v-if="order.status == -3" class="inner">
 						<view class="img-box">
-							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/shopping/close_trade.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/close_trade.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">交易关闭</text>
@@ -72,7 +73,7 @@
 					</view>
 					<view v-if="order.status == -1" class="inner">
 						<view class="img-box">
-							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/shopping/close_trade.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/close_trade.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">申请售后</text>
@@ -81,7 +82,7 @@
 					</view>
 					<view v-if="order.status == -2" class="inner">
 						<view class="img-box">
-							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/shopping/close_trade.png" mode=""></image>
+							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/close_trade.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">退款成功</text>
@@ -92,7 +93,7 @@
 				<!-- 下单人信息 -->
 				<view class="order-placer">
 					<view class="inner">
-						<image class="location" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/shopping/location.png" mode=""></image>
+						<image class="location" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/location.png" mode=""></image>
 						<view class="info">
 							<view class="name-phone">
 								<text class="text">{{order.realName}}</text>
@@ -116,7 +117,7 @@
 								<view class="info-box">
 									<view>
 										<view class="name-box ellipsis2">
-											<view v-if="item.isPrescribe==1" class="tag">处方药</view>
+											<view v-if="item.isPrescribe==1" class="tag">Rx</view>
 											{{JSON.parse(item.jsonInfo).commonName&&JSON.parse(item.jsonInfo).commonName!=='-'?JSON.parse(item.jsonInfo).commonName:JSON.parse(item.jsonInfo).productName}}
 										</view>
 										<view class="spec ellipsis2">{{JSON.parse(item.jsonInfo).sku}}</view>
@@ -230,7 +231,7 @@
 							<text class="label">电子处方</text>
 							<view class="check-box" @click="showImg()">
 								<text class="text">查看</text>
-								<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/shopping/arrow4.png" mode=""></image>
+								<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/images/arrow4.png" mode=""></image>
 							</view>
 						</view>
 						<view class="item">
@@ -454,9 +455,14 @@
 </script>
 
 <style lang="scss">
+	.bg-color {
+		width: 100%;
+		background: linear-gradient(to right, #2583EB 0%, #60CDC3 100%);
+		height: 450rpx;
+	}
 	.fixed-top-box{
 		width: 100%;
-		background: linear-gradient(135deg, #2BC7B9 0%, #60CDC3 100%);
+		background: linear-gradient(to right, #2583EB 0%, #60CDC3 100%);
 		position: fixed;
 		top: 0;
 		left: 0;
@@ -631,7 +637,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #2BC7B9 0%, #2BC7A4 100%);
+							background: red;
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -826,7 +832,7 @@
 				color: #666666;
 			}
 			&.pay{
-				background: #2BC7B9;
+				background: #2583EB;
 				color: #FFFFFF;
 			}
 		}