Merge branch 'master' of http://1.14.104.71:10880/puyao/jinNiucourseMall_uniapp

# Conflicts:
#	manifest.json
#	store/index.js

App.vue

@@ -6,8 +6,7 @@
 		globalData: {
 			// wsUrl: 'wss://websocket.cdwjyyh.com',
 			wsUrl: '',
-			// appId: 'wx1de020b57c05a990',
-			appId: 'wxd2edd379beb6581b',
+			appId: 'wxd2892bb660356ecf',
 		},
 		onLoad: function (){
 			

api/storeAfterSales.js

@@ -9,7 +9,8 @@ let request = new Request().http
  }
  
  export function getAfterSalesList(data) {
- 	 return request('/app/storeAfterSales/getStoreAfterSalesList',data,'GET');
+ 	 //return request('/app/storeAfterSales/getStoreAfterSalesList',data,'GET');///旧版
+	 return request('/app/order/getMergedAfterSalesList',data,'GET');
  } 
  
  export function getAfterSalesDetails(data) {

api/storeOrder.js

@@ -3,7 +3,8 @@ let request = new Request().http
 
  
  export function getMyStoreOrderList(data) {
- 	 return request('/app/storeOrder/getMyStoreOrderList',data,'GET');
+ 	 //return request('/app/storeOrder/getMyStoreOrderList',data,'GET');//旧版
+ 	 return request('/app/order/getMyMergedOrderList',data,'GET')
  } 
  export function getCompanyStoreOrderList(data) {
  	 return request('/app/storeOrder/getCompanyStoreOrderList',data,'GET');
@@ -78,4 +79,7 @@ let request = new Request().http
  	 return request('/app/storeOrder/orderBindUser',data,'POST','application/json;charset=UTF-8');
  }  
  
- 
+ // 删除订单
+ export function deleteOrder(data) {
+ 	return request('/app/order/deleteOrder', data, 'POST', 'application/json;charset=UTF-8');
+ }

common/request.js

@@ -6,10 +6,10 @@ export default class Request {
 		let that = this;
 		// let path ='http://k26a55d9.natappfree.cc/'//本地
 		// let path = 'https://userapp.kangniantangyiyao.top/store'//臻选
-		let path = 'https://userappB.kangniantangyiyao.top/store'//惠选
-		// let path = 'http://192.168.110.247:8113/store'
+		let path = 'https://userappB.kangniantangyiyao.top/store'//惠选和其他小程序
+		//let path = 'http://192.168.110.59:8113/store'
 		// let path2 = 'https://userapp.kangniantangyiyao.top'//直播
-		let path2 = 'http://192.168.110.59:8113'//本地（直播）
+		let path2 = 'https://userappB.kangniantangyiyao.top'//本地（直播）
 		let type = 0
 		uni.setStorageSync('requestPath',path)
 		// uni.showLoading({
@@ -19,11 +19,11 @@ export default class Request {
 					path = 'https://im.fhhx.runtzh.com';
 				}
 		if (router.indexOf("/app/order/getMyMergedOrderList") != -1 || router.indexOf("/app/order/deleteOrder") != -1) {
-			path = 'https://userapp.kangniantangyiyao.top';
+			path = 'https://userappB.kangniantangyiyao.top';
 		}
 			
 		if (router.indexOf("/app/order/getMergedAfterSalesList") != -1) {
-				path = 'https://userapp.kangniantangyiyao.top';
+				path = 'https://userappB.kangniantangyiyao.top';
 			}
 		if (router.indexOf("/live") !== -1 || router.indexOf("/liveAPP") !== -1) {
 			// path = 'https://userapp.kangniantangyiyao.top';

pages.json

@@ -24,8 +24,8 @@
 		{
 			"path": "pages/home/index",
 			"style": {
-				// "navigationBarTitleText": "德信严选 ",
-				"navigationBarTitleText": "德信严选 ",
+				// "navigationBarTitleText": "德信小站 ",
+				"navigationBarTitleText": "德信小站 ",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom",
 				"app-plus": {
@@ -1439,7 +1439,7 @@
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "德信严选 ",
+		"navigationBarTitleText": "德信小站 ",
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#FFFFFF"
 	},

pages/auth/login.vue

@@ -7,8 +7,8 @@
 		  	<view class="logo-img">
 				<image  :src="logoimg"></image>
 		  	</view>
-		  	<!-- <view class="title">德信严选 </view> -->
-			<view class="title">德信严选 </view>
+		  	<!-- <view class="title">德信小站 </view> -->
+			<view class="title">德信小站 </view>
 		  </view>
         <!-- <open-data class="user-avatar" type="userAvatarUrl"></open-data>
         <open-data class="user-name" type="userNickName"></open-data> -->

pages/common/launch.vue

@@ -5,7 +5,7 @@
 				<view class="circle"></view>
 				<image :src="logoimg"></image>
 			</view>
-			<text class="text">德信严选 </text>
+			<text class="text">德信小站 </text>
 		</view>
 	</view>
 </template>

pages/home/index.vue

@@ -8,7 +8,7 @@
 					<!-- 这里是状态栏 -->
 					<view class="status_bar" :style="{height: statusBarHeight}"></view>
 					<view class="top-title">
-						<view class="name">德信严选 </view>
+						<view class="name">德信小站 </view>
 						<!-- <view class="dot">•</view><view class="sub-name">七彩互联网医院</view> -->
 					</view>
 					<!-- 搜索框、购物车、客服 -->
@@ -457,7 +457,7 @@
 		},
 		onShareAppMessage(res) {
 			return {
-				title: '德信严选 -您的专属健康解决方案',
+				title: '德信小站 -您的专属健康解决方案',
 				path: `/pages/common/launch`,
 				imageUrl:this.logoimg//分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 			}
@@ -469,7 +469,7 @@
 		//分享到朋友圈
 		onShareTimeline(res) {
 			return {
-				title: '德信严选 -您的专属健康解决方案',
+				title: '德信小站 -您的专属健康解决方案',
 				query: '', //页面参数
 				imageUrl: this.logoimg//分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 			}
@@ -1025,7 +1025,7 @@
 		left: 0;
 		z-index: 1000;
 		transition: all 0.5s;
-		background-color: #2BC7B9;
+		background: linear-gradient(135deg, #2BC7B9 0%, #60CDC3 100%);
 
 		&.show-back {
 			// background: linear-gradient(135deg, #66b2ef 0%, #2BC7B9 100%);

pages/shopping/paymentOrder.vue

@@ -12,7 +12,7 @@
 				<text class="desc" v-if="payType==3">货到付款金额{{payDelivery.toFixed(2)}}，请您在收到快递后支付给快递人员。</text>
 			</view>
 			<!-- 支付方式 -->
-			<view class="pay-type">
+			<view class="pay-type" v-if="isRefresh">
 				<view class="title">支付方式</view>
 				<!-- 改价订单只能选择微信支付和物流代收 -->
 				<radio-group  @change="payTypeChange" v-if="order.isEditMoney!=null&&order.isEditMoney==1">
@@ -43,7 +43,7 @@
 							<text class="text">微信支付</text>
 						</view>
 						<label>
-							<radio :value="1" :checked="order.payType=='1'" />
+							<radio :value="'1'" :checked="order.payType=='1'" />
 						</label>
 					</view>
 					<view class="item" >
@@ -52,7 +52,7 @@
 							<text class="text">物流代收</text>
 						</view>
 						<label>
-							<radio  :value="2" :checked="order.payType=='2'" />
+							<radio  :value="'2'" :checked="order.payType=='2'" />
 						</label>
 					</view>
 					<!-- <view class="item" v-if="user!=null&&user.level==1 "> -->
@@ -62,7 +62,7 @@
 							<text class="text">货到付款</text>
 						</view>
 						<label>
-							<radio  :value="3" :checked="order.payType=='3'" />
+							<radio  :value="'3'" :checked="order.payType=='3'" />
 						</label>
 					</view>
 				</radio-group>
@@ -176,6 +176,8 @@
 				payLimitTime:null,
 				order:null,
 				user:null,
+				isRefresh: true,
+				storeOrder: {}
 			}
 		},
 		onLoad(option) {
@@ -283,7 +285,10 @@
 						if(res.code==200){
 							console.log(res);
 							uni.hideLoading();
+							that.storeOrder = res; // 用于editPayType失败后的展示
 							that.order=res.order;
+							that.payMoney=this.order.payMoney;
+							that.payDelivery=this.order.payDelivery;
 							that.payLimitTime=res.payLimitTime;
 							//套餐订单处理
 							if(res.productPackage!=null){
@@ -310,25 +315,35 @@
 				var data = {orderId:this.orderId,payType:payType};
 				var that=this;
 				uni.showLoading();
-				editPayType(data).then(
-					res => {
-						if(res.code==200){
-							console.log(res);
-							uni.hideLoading();
-							that.order=res.order;
-							//this.payType=this.order.payType
-							this.payMoney=this.order.payMoney;
-							this.payDelivery=this.order.payDelivery;
-						}else{
-							uni.showToast({
-								icon:'none',
-								title: res.msg,
-							});
+				editPayType(data).then(res => {
+					uni.hideLoading();
+					if(res.code==200){
+						console.log(res);
+						that.order=res.order;
+						//this.payType=this.order.payType
+						this.payMoney=this.order.payMoney;
+						this.payDelivery=this.order.payDelivery;
+					}else{
+						this.order = that.storeOrder.order
+						if(that.storeOrder.productPackage!=null){
+							this.payType=that.storeOrder.productPackage.payType;
+							if(this.order.payType==4){
+								this.order.payType=1;
+							}
 						}
-					},
-					rej => {}
-				);
-				
+						this.isRefresh = false
+						this.$nextTick(() => {
+							this.isRefresh = true
+						})
+						console.log("this.order.payType==",this.order.payType)
+						uni.showToast({
+							icon:'none',
+							title: res.msg,
+						});
+					}
+				}).catch(()=>{
+					uni.hideLoading();
+				});
 			},
 			otherPayOrder(){
 				uni.navigateTo({
@@ -388,6 +403,7 @@
 							 }
 							 
 						}else{
+							uni.hideLoading();
 							uni.showToast({
 								icon:'none',
 								title: res.msg,
@@ -566,7 +582,7 @@
 			}
 		}
 		.btn-box{
-			height: 242upx;
+			padding: 30rpx 0;
 			background: #FFFFFF;
 			display: flex;
 			align-items: center;
@@ -576,7 +592,7 @@
 			bottom: 0;
 			width: 100%;
 			.btn{
-				width: 91.73%;
+				width: 90%;
 				height: 88upx;
 				line-height: 88upx;
 				font-size: 30upx;

pages/shopping/prescribe.vue

@@ -451,7 +451,7 @@
 		justify-content: space-between;
 		.fixed-top-box{
 			width: 100%;
-			background: linear-gradient(135deg, #66b2ef 0%, #2BC7B9 100%);
+			background: linear-gradient(135deg, #2BC7B9 0%, #60CDC3 100%);
 			position: fixed;
 			top: 0;
 			left: 0;

pages_company/couponDetails.vue

@@ -113,11 +113,6 @@ export default {
 	  this.CompanyUserInfo=uni.getStorageSync('CompanyUserInfo');
 	  this.user=uni.getStorageSync('userInfo');
   },
-  onHide() {
-  	wx.updateShareMenu({
-		isPrivateMessage: false
-	})
-  },
   methods: {
 	  sendpop(id){
 	  	this.sendCoupon(id)

pages_company/index.vue

@@ -48,10 +48,10 @@
 					 	<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/app/image/wechat.png" mode=""></image>
 					 	<text class="text">微信收款码</text>
 					 </view>
-					<!-- <view class="item" @click="toShareLive()">
+					<view class="item" @click="toShareLive()">
 					 	<image src="https://kntobs.jnmyunl.com/userapp/images/live_icon.png" mode=""></image>
 					 	<text class="text">分享直播间</text>
-					 </view> -->
+					 </view>
 				</view>
 			</view>
 			<!-- 退出登录按钮 -->

pages_company/order/confirmCompanyOrder.vue

@@ -88,6 +88,9 @@
 		},
 		//发送给朋友
 		onShareAppMessage(res) {
+			wx.updateShareMenu({
+				isPrivateMessage: true
+			})
 			return {
 				title: this.carts[0].productName,
 				path: '/pages_company/order/confirmOrder?orderKey='+this.orderKey,
@@ -95,14 +98,14 @@
 			}
 			
 		},
-		//分享到朋友圈
-		onShareTimeline(res) {
-			return {
-				title:this.carts[0].productName,
-				query:'orderKey='+this.orderKey,
-				imageUrl: this.carts[0].productImage //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
-			}
-		},
+		// //分享到朋友圈
+		// onShareTimeline(res) {
+		// 	return {
+		// 		title:this.carts[0].productName,
+		// 		query:'orderKey='+this.orderKey,
+		// 		imageUrl: this.carts[0].productImage //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+		// 	}
+		// },
 		methods: {
 			handleAgreement(){
 				this.isAgreement=!this.isAgreement

pages_company/order/confirmOrder.vue

@@ -1,61 +1,67 @@
 <template>
 	<view>
-		<view class="inner-box">
-			<!-- 药品列表 -->
-			<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.productImage" mode="aspectFill"></image>
-					</view>
-					<view class="info-box">
-						<view>
-							<view class="name-box ellipsis2">
-								<view class="tag">{{utils.getDictLabelName("storeProductType",item.productType)}}</view>{{item.productName}}
-							</view>
-							<view class="spec ellipsis2">{{item.productAttrName}}</view>
+		<view v-if="carts&&carts.length>0">
+			<view class="inner-box">
+				<!-- 药品列表 -->
+				<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.productImage" mode="aspectFill"></image>
 						</view>
-						<view class="price-num">
-							<view class="price">
-								<text class="unit">¥</text>
-								<text class="num">{{item.price.toFixed(2)}}</text>
+						<view class="info-box">
+							<view>
+								<view class="name-box ellipsis2">
+									<view class="tag">{{utils.getDictLabelName("storeProductType",item.productType)}}</view>{{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>
+								</view>
+								<view class="num">x{{item.cartNum}}</view>
 							</view>
-							<view class="num">x{{item.cartNum}}</view>
 						</view>
 					</view>
-				</view>
-				<!-- 小计 -->
-				<view class="sub-total">
-					<text class="label">订单金额：</text>
-					<view class="price">
-						<text class="unit">¥</text>
-						<text class="num">{{price.totalPrice.toFixed(2)}}</text>
+					<!-- 小计 -->
+					<view class="sub-total">
+						<text class="label">订单金额：</text>
+						<view class="price">
+							<text class="unit">¥</text>
+							<text class="num">{{price.totalPrice.toFixed(2)}}</text>
+						</view>
 					</view>
 				</view>
+				 
 			</view>
-			 
-		</view>
-		<!-- 底部按钮 -->
-		<view class="btn-foot">
-			<view class="right">
-				<view class="total">
-					<text class="label">实付金额：</text>
-					<view class="price">
-						<text class="unit">¥</text>
-						<text class="num">{{price.payPrice.toFixed(2)}}</text>
+			<!-- 底部按钮 -->
+			<view class="btn-foot">
+				<view class="right">
+					<view class="total">
+						<text class="label">实付金额：</text>
+						<view class="price">
+							<text class="unit">¥</text>
+							<text class="num">{{price.payPrice.toFixed(2)}}</text>
+						</view>
 					</view>
+					 
+					<view class="btn" @click="submitOrder">支付{{price.payPrice.toFixed(2)}}</view>
 				</view>
-				 
-				<view class="btn" @click="submitOrder">支付{{price.payPrice.toFixed(2)}}</view>
 			</view>
-		</view>
-		<view class="message-box" v-if="messageShow">
-			<view class="left">
-				<image src="https://kntobs.jnmyunl.com/shop/images/close24.png" mode="" @click="closeOrder()" ></image>
-				<view class="text ellipsis">您有{{count0}}个待支付订单</view>
+			<view class="message-box" v-if="messageShow">
+				<view class="left">
+					<image src="https://kntobs.jnmyunl.com/shop/images/close24.png" mode="" @click="closeOrder()" ></image>
+					<view class="text ellipsis">您有{{count0}}个待支付订单</view>
+				</view>
+				<view class="btn" @click="showOrder()">查看</view>
 			</view>
-			<view class="btn" @click="showOrder()">查看</view>
+			<ykscreenRecord></ykscreenRecord>
+		</view>
+		<view class="x-c" v-else style="flex-direction: column;height: 70vh;">
+			<image src="https://kntobs.jnmyunl.com/shop/images/no_data.png" mode="widthFix" style="width: 500rpx;"></image>
+			<view>{{msg}}</view>
 		</view>
-		<ykscreenRecord></ykscreenRecord>
 	</view>
 </template>
 
@@ -78,7 +84,7 @@
 					payPrice:0.00,
 				},
 				carts:[],
-				
+				msg:'加载中'
 			}
 		},
 		onLoad(option) {
@@ -86,6 +92,9 @@
 			this.orderKey=option.orderKey;
 		},
 		onShow() {
+			wx.updateShareMenu({
+				isPrivateMessage: true
+			})
 			if(this.utils.isLogin()){
 				this.getOrderCount();
 			}
@@ -136,6 +145,7 @@
 			getSalesOrder(item){
 				var that=this;
 				var data={createOrderKey:this.orderKey}
+				this.msg = ''
 				getSalesOrder(data).then(
 					res => {
 						if(res.code==200){
@@ -145,6 +155,7 @@
 							});
 							that.price.payPrice=res.totalMoney
 						}else{
+							this.msg =res.msg
 							uni.showToast({
 								icon:'none',
 								title: res.msg,

pages_company/storeOrderDetail.vue

@@ -373,7 +373,7 @@
 <style lang="scss">
 	.fixed-top-box{
 		width: 100%;
-		background: linear-gradient(135deg, #66b2ef 0%, #2BC7B9 100%);
+		background: linear-gradient(135deg, #2BC7B9 0%, #60CDC3 100%);
 		position: fixed;
 		top: 0;
 		left: 0;

pages_company/storeProductPackageDetails.vue

@@ -177,11 +177,6 @@
 			}
 			this.getStoreProductPackageDetails();
 		},
-		onHide() {
-			wx.updateShareMenu({
-				isPrivateMessage: false
-			})
-		},
 		methods: {
 			getOrderCount(){
 				getOrderCount().then(

pages_course/living.vue

@@ -4445,8 +4445,8 @@
 
 			try {
 				// const baseWsUrl = 'wss://ws.klbycp.com/ws/app/webSocket';
-				const baseWsUrl = 'ws://192.168.110.59:7114/ws/app/webSocket';
-				// const baseWsUrl = 'ws://d6998672.natappfree.cc/ws/app/webSocket';
+				//const baseWsUrl = 'ws://192.168.110.59:7114/ws/app/webSocket';
+				const baseWsUrl = 'wss://liveapp.kangniantangyiyao.top/ws/app/webSocket';
 				// const baseWsUrl = 'ws://nd967d83.natappfree.cc/ws/app/webSocket';
 				let wsUrl =
 					`${baseWsUrl}?userId=${this.userInfo.userId}&liveId=${this.liveId}&userType=${this.userType}&timestamp=${this.timestamp}&signature=${signature}`;

pages_shopping/live/goods.vue

@@ -222,7 +222,7 @@
 			// 提交
 			submit() {
 				this.specVisible = false
-				this.doAddCart(this.type);
+				this.doAddCart('buy');
 			},
 			// 加入购物车
 			addCart(type) {

pages_user/user/pay.vue

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

pages_user/user/refundOrder.vue

@@ -3,7 +3,7 @@
 		<view class="inner">
 			<!-- 药品列表 -->
 			<view class="drug-list">
-				<view  class="item">
+				<view class="item">
 					<!-- 药品信息 -->
 					<!-- <view v-if="order!=null&&order.isPackage!=1" class="drug-info" v-for="(item,index) in items" :key="index"> -->
 					<view class="drug-info" v-for="(item,index) in items" :key="index">
@@ -24,18 +24,18 @@
 							</view>
 						</view>
 					</view>
-					<view  v-if="order!=null&&order.isPackage==1&&order.packageJson!=null"   class="drug-info">
+					<view v-if="order!=null&&order.isPackage==1&&packageJson!=null" class="drug-info">
 						<view class="img-box">
-							<image :src="JSON.parse(order.packageJson).imgUrl" mode="aspectFit"></image>
+							<image :src="packageJson.imgUrl" mode="aspectFit"></image>
 						</view>
 						<view class="info">
 							<view class="top">
 								<view class="title ellipsis2">
-									<view class="tag">套餐</view>{{JSON.parse(order.packageJson).title}}
+									<view class="tag">套餐</view>{{packageJson.title}}
 								</view>
-								<view class="spec">{{JSON.parse(order.packageJson).descs}}</view>
+								<view class="spec">{{packageJson.descs}}</view>
 							</view>
-							 
+
 						</view>
 					</view>
 				</view>
@@ -44,12 +44,13 @@
 			<view class="reason-apply">
 				<view class="title-box">
 					<text class="label">退款金额</text>
-					 <input class="money" type="text" disabled v-model="refundAmount" placeholder="退款金额" placeholder-class="form-input" />
+					<input class="money" type="text" disabled v-model="refundAmount" placeholder="退款金额"
+						placeholder-class="form-input" />
 				</view>
 				<view class="title-box">
 					<text class="label">申请原因</text>
-					<picker @change="reasonsChange" :value="reasons"  range-key="dictLabel" :range="reasonsList">
-						<view class="chose-box"  >
+					<picker @change="reasonsChange" :value="reasons" range-key="dictLabel" :range="reasonsList">
+						<view class="chose-box">
 							<text class="text">{{reasons}}</text>
 							<image src="https://kntobs.jnmyunl.com/shop/images/arrow_gray.png" mode=""></image>
 						</view>
@@ -77,77 +78,88 @@
 					<text class="text">重庆市江北区建玛特商场5楼</text>
 				</view>
 			</view> -->
-			 <!-- 底部按钮 -->
-			 <view class="btn-box">
-			 	<view class="sub-btn" @click="submit()">申请售后</view>
-			 </view>
+			<!-- 底部按钮 -->
+			<view class="btn-box">
+				<view class="sub-btn" @click="submit()">申请售后</view>
+			</view>
 		</view>
-		
-	 
+
+
 	</view>
 </template>
 
 <script>
-	import {applyAfterSales,getMyStoreOrderItemByOrderId} from '@/api/storeAfterSales'
+	import {
+		applyAfterSales,
+		getMyStoreOrderItemByOrderId
+	} from '@/api/storeAfterSales'
 	export default {
-		 
+
 		data() {
 			return {
-				orderId:null,
-				order:null,
-				orderCode:null,
-				items:[],
-				type:null,
-				reasonsList:[],
-				reasons:"请选择",
-				explains:"",
+				packageJson:null,
+				orderId: null,
+				order: null,
+				orderCode: null,
+				items: [],
+				type: null,
+				reasonsList: [],
+				reasons: "请选择",
+				explains: "",
+				orderitems: null
 				// refundAmount:0.00,
 			}
 		},
 		onLoad(option) {
 			console.log(option);
-			this.type=option.type;
-			this.orderCode=option.orderCode;
-			this.items=uni.getStorageSync('refundItems')
-			console.log(uni.getStorageSync('refundItems'))
-			console.log(JSON.parse(this.items[0].jsonInfo));
-			this.reasonsList=this.utils.getDict("storeAfterSalesReasons");
-			this.orderId=option.orderId;
-			// this.getMyStoreOrderItemByOrderId()
+			this.type = option.type;
+			this.orderCode = option.orderCode;
+			this.items = uni.getStorageSync('refundItems')
+			const isPackage = option.isPackage || 0
+			this.reasonsList = this.utils.getDict("storeAfterSalesReasons");
+			this.orderId = option.orderId;
+			
+			if (isPackage == 1) {
+				this.getMyStoreOrderItemByOrderId()
+			}
 		},
-		computed:{
-			refundAmount(){
-				const counts = this.items.map(item=> {
-					return{
-						...item,
-						price:JSON.parse(item.jsonInfo).price*item.num
-						}
+		computed: {
+			refundAmount() {
+				if(this.order&&this.order.isPackage ==1) {
+					// return this.order.payMoney.toFixed(2)
+					if (this.order.isPayRemain == 0) {
+						return this.order.payMoney.toFixed(2)
+					} else {
+						return this.order.payPrice.toFixed(2)
 					}
-				);
-				const count = counts.reduce((accumulator, item) => accumulator + item.price, 0);
-				console.log(count)
-				return count
+				} else {
+					const counts = this.items.map(item => {
+						return {
+							...item,
+							price: JSON.parse(item.jsonInfo).price * item.num
+						}
+					});
+					const count = counts.reduce((accumulator, item) => accumulator + item.price, 0);
+					return count
+				}
 			}
 		},
 		methods: {
-			getMyStoreOrderItemByOrderId(){
-				var data={orderId:this.orderId};
+			getMyStoreOrderItemByOrderId() {
+				var data = {
+					orderId: this.orderId
+				};
 				getMyStoreOrderItemByOrderId(data).then(res => {
-					if(res.code==200){
-						this.order=res.order;
-						this.items=res.items;
-						if(this.order.isPayRemain==0){
-							this.refundAmount=this.order.payMoney.toFixed(2)
-						}
-						else{
-							this.refundAmount=this.order.payPrice.toFixed(2)
-						}
-					}else{
+					if (res.code == 200) {
+						this.order = res.order;
+						this.orderitems = res.items
+						this.packageJson = this.order&&this.order.isPackage ==1 ? JSON.parse(this.order.packageJson): null
+					} else {
 						uni.showToast({
-							icon:'none',
+							icon: 'none',
 							title: "请求失败",
 						});
-						 
+
 					}
 				});
 			},
@@ -155,49 +167,59 @@
 				console.log(e.detail.value)
 				this.reasons = this.reasonsList[e.detail.value].dictLabel
 			},
-			submit(){
-				if(this.reasons=="请选择"){
+			submit() {
+				if (this.reasons == "请选择") {
 					uni.showToast({
-						icon:'none',
+						icon: 'none',
 						title: '请选择原因'
 					});
 					return;
 				}
-				if(this.refundAmount<0){
+				if (this.refundAmount < 0) {
 					uni.showToast({
-						icon:'none',
+						icon: 'none',
 						title: '请输入退款金额'
 					});
 					return;
 				}
-				 
-				var productIds=this.items.map(item=>item.productId);
-				var nums=this.items.map(item=>item.num);
-				var products=[];
-				for(var i=0;i<productIds.length;i++){
-					var item={productId:productIds[i],num:nums[i]};
+				const items = this.order&&this.order.isPackage ==1 ? this.orderitems : this.items
+				var productIds = items.map(item => item.productId);
+				var nums = items.map(item => item.num);
+				var products = [];
+				for (var i = 0; i < productIds.length; i++) {
+					var item = {
+						productId: productIds[i],
+						num: nums[i]
+					};
 					products.push(item);
 				}
-				var data={refundAmount:this.refundAmount,orderCode:this.orderCode,serviceType:this.type,reasons:this.reasons,explains:this.explains,productList:products};
+				var data = {
+					refundAmount: this.refundAmount,
+					orderCode: this.orderCode,
+					serviceType: this.type,
+					reasons: this.reasons,
+					explains: this.explains,
+					productList: products
+				};
 				applyAfterSales(data).then(res => {
-					if(res.code==200){
-						 uni.showToast({
-						 	icon:'success',
-						 	title:'提交成功'
-						 });
-						 setTimeout(function() {
-							 uni.$emit('refreshOrder');
-							 uni.navigateBack({
-								 delta: 1
-							 })
-						 }, 500);
-						 
-					}else{
+					if (res.code == 200) {
 						uni.showToast({
-							icon:'none',
+							icon: 'success',
+							title: '提交成功'
+						});
+						setTimeout(function() {
+							uni.$emit('refreshOrder');
+							uni.navigateBack({
+								delta: 1
+							})
+						}, 500);
+
+					} else {
+						uni.showToast({
+							icon: 'none',
 							title: res.msg
 						});
-						 
+
 					}
 				});
 			},
@@ -206,43 +228,51 @@
 </script>
 
 <style lang="scss">
-	.content{
+	.content {
 		margin-bottom: 170upx;
-		.inner{
+
+		.inner {
 			padding: 20upx;
-			.drug-list{
-				.item{
+
+			.drug-list {
+				.item {
 					background: #FFFFFF;
 					border-radius: 16upx;
 					margin-bottom: 20upx;
 					padding: 0 30upx;
-					.drug-info{
+
+					.drug-info {
 						display: flex;
 						align-items: center;
 						padding: 30upx 0;
-						.img-box{
+
+						.img-box {
 							width: 160upx;
 							height: 160upx;
 							margin-right: 30upx;
-							image{
+
+							image {
 								width: 100%;
 								height: 100%;
 							}
 						}
-						.info{
+
+						.info {
 							width: calc(100% - 160upx);
 							height: 160upx;
 							display: flex;
 							flex-direction: column;
 							justify-content: space-between;
-							.top{
-								.title{
+
+							.top {
+								.title {
 									font-size: 28upx;
 									font-family: PingFang SC;
 									font-weight: 500;
 									color: #111111;
 									line-height: 1.4;
-									.tag{
+
+									.tag {
 										display: inline-block;
 										padding: 0 6upx;
 										height: 30upx;
@@ -258,7 +288,8 @@
 										margin-top: 7upx;
 									}
 								}
-								.spec{
+
+								.spec {
 									font-size: 24upx;
 									font-family: PingFang SC;
 									font-weight: 500;
@@ -267,14 +298,17 @@
 									margin-top: 14upx;
 								}
 							}
-							.price-num{
+
+							.price-num {
 								display: flex;
 								align-items: center;
 								justify-content: space-between;
-								.price-box{
+
+								.price-box {
 									display: flex;
 									align-items: flex-end;
-									.unit{
+
+									.unit {
 										font-size: 24upx;
 										font-family: PingFang SC;
 										font-weight: 500;
@@ -282,7 +316,8 @@
 										line-height: 1.2;
 										margin-right: 5upx;
 									}
-									.price{
+
+									.price {
 										font-size: 32upx;
 										font-family: PingFang SC;
 										font-weight: 500;
@@ -290,7 +325,8 @@
 										line-height: 1;
 									}
 								}
-								.num{
+
+								.num {
 									font-size: 24upx;
 									font-family: PingFang SC;
 									font-weight: bold;
@@ -299,52 +335,61 @@
 							}
 						}
 					}
-					 
+
 				}
 			}
-			.reason-apply{
+
+			.reason-apply {
 				margin-top: 20upx;
 				background: #FFFFFF;
 				border-radius: 16upx;
 				padding: 0 30upx;
-				.title-box{
+
+				.title-box {
 					height: 86upx;
 					display: flex;
 					align-items: center;
 					justify-content: space-between;
 					border-bottom: 1px solid #F0F0F0;
-					.label{
+
+					.label {
 						font-size: 30upx;
 						font-family: PingFang SC;
 						font-weight: bold;
 						color: #333333;
 					}
-					.money{
-						
+
+					.money {
+
 						font-size: 24upx;
 						font-family: PingFang SC;
 						font-weight: 500;
 						color: #999999;
 					}
-					.chose-box{
+
+					.chose-box {
 						display: flex;
 						align-items: center;
-						.text{
+
+						.text {
 							font-size: 24upx;
 							font-family: PingFang SC;
 							font-weight: 500;
 							color: #999999;
 						}
-						image{
+
+						image {
 							width: 14upx;
 							height: 24upx;
 							margin-left: 10upx;
 						}
 					}
 				}
-				.textarea-box{
+
+				.textarea-box {
 					padding: 30upx 0;
-					textarea{
+
+					textarea {
 						width: 100%;
 						box-sizing: border-box;
 						background: #F5F5F5;
@@ -355,7 +400,8 @@
 						font-weight: 500;
 						color: #111111;
 					}
-					.textarea-place{
+
+					.textarea-place {
 						font-size: 24upx;
 						font-family: PingFang SC;
 						font-weight: 500;
@@ -363,25 +409,29 @@
 					}
 				}
 			}
-			.return-method{
+
+			.return-method {
 				background: #FFFFFF;
 				border-radius: 16upx;
 				margin-top: 20upx;
 				padding: 0 30upx 40upx;
-				.title-box{
+
+				.title-box {
 					height: 86upx;
 					display: flex;
 					align-items: center;
 					justify-content: space-between;
 					border-bottom: 1px solid #F0F0F0;
-					.text{
+
+					.text {
 						font-size: 30upx;
 						font-family: PingFang SC;
 						font-weight: bold;
 						color: #333333;
 					}
 				}
-				.return-tips{
+
+				.return-tips {
 					margin-top: 30upx;
 					margin-bottom: 30upx;
 					height: 80upx;
@@ -390,50 +440,59 @@
 					padding: 0 20upx;
 					display: flex;
 					align-items: center;
-					.text{
+
+					.text {
 						font-size: 24upx;
 						font-family: PingFang SC;
 						font-weight: 500;
 						color: #EF8A07;
 					}
 				}
-				.info-item{
+
+				.info-item {
 					display: flex;
 					align-items: center;
 					justify-content: space-between;
 					margin-bottom: 40upx;
-					&:last-child{
+
+					&:last-child {
 						margin-bottom: 0;
 					}
-					.label{
+
+					.label {
 						font-size: 26upx;
 						font-family: PingFang SC;
 						font-weight: 500;
 						color: #666666;
 						line-height: 1;
 					}
-					.text{
+
+					.text {
 						font-size: 26upx;
 						font-family: PingFang SC;
 						font-weight: 500;
 						color: #111111;
 						line-height: 1;
 					}
-					.detail-box{
+
+					.detail-box {
 						display: flex;
 						align-items: center;
-						.price-box{
+
+						.price-box {
 							display: flex;
 							align-items: flex-end;
 							margin-right: 18upx;
-							.unit{
+
+							.unit {
 								font-size: 24upx;
 								font-family: PingFang SC;
 								font-weight: 500;
 								color: #111111;
 								line-height: 1.2;
 							}
-							.num{
+
+							.num {
 								font-size: 32upx;
 								font-family: PingFang SC;
 								font-weight: bold;
@@ -441,13 +500,15 @@
 								line-height: 1;
 							}
 						}
-						.det-text{
+
+						.det-text {
 							font-size: 26upx;
 							font-family: PingFang SC;
 							font-weight: 500;
 							color: #111111;
 						}
-						image{
+
+						image {
 							width: 14upx;
 							height: 24upx;
 							margin-left: 10upx;
@@ -456,16 +517,18 @@
 				}
 			}
 		}
-		 
-		.reson-box{
+
+		.reson-box {
 			padding: 0 10upx 60upx;
-			.reson-item{
+
+			.reson-item {
 				width: 100%;
 				height: 110upx;
 				display: flex;
 				align-items: center;
 				justify-content: space-between;
-				.title{
+
+				.title {
 					font-size: 30upx;
 					font-family: PingFang SC;
 					font-weight: 500;
@@ -474,13 +537,15 @@
 			}
 		}
 	}
-	.btn-box{
+
+	.btn-box {
 		height: 120upx;
 		padding: 0 30upx;
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		.sub-btn{
+
+		.sub-btn {
 			width: 100%;
 			height: 88upx;
 			line-height: 88upx;
@@ -493,14 +558,16 @@
 			border-radius: 44upx;
 		}
 	}
-	input{
+
+	input {
 		text-align: right;
 	}
-	.form-input{
+
+	.form-input {
 		font-size: 30upx;
 		font-family: PingFang SC;
 		font-weight: 500;
 		color: #999999;
 		text-align: right;
 	}
-</style>
+</style>

pages_user/user/refundOrderDetail.vue

@@ -274,7 +274,7 @@
 <style lang="scss">
 	.fixed-top-box{
 		width: 100%;
-		background: linear-gradient(135deg, #66b2ef 0%, #2BC7B9 100%);
+		background: linear-gradient(135deg, #2BC7B9 0%, #60CDC3 100%);
 		position: fixed;
 		top: 0;
 		left: 0;

pages_user/user/refundOrderProduct.vue

@@ -80,7 +80,15 @@
 				item.checked=!item.checked;
 			},
 			submit(type){
-				var refundItems=this.items.filter(item => item.checked==true )
+				let refundItems=this.items.filter(item => item.checked==true )
+				if(this.order.isPackage==1) {
+					const item = {
+						...JSON.parse(this.order.packageJson),
+						payMoney:this.order.payMoney
+					}
+					
+					refundItems= [item]
+				}
 				if(refundItems.length==0){
 					uni.showToast({
 						icon:'none',
@@ -89,7 +97,7 @@
 					return;
 				}
 				uni.navigateTo({
-					url: '/pages_user/user/refundOrder?items='+JSON.stringify(refundItems)+"&type="+type+"&orderCode="+this.order.orderCode
+					url: '/pages_user/user/refundOrder?type='+type+"&orderCode="+this.order.orderCode+"&isPackage="+this.order.isPackage+'&orderId='+this.orderId
 				})
 				// uni.navigateTo({
 				// 	url: '/pages_user/user/refundOrder?type='+type+"&orderCode="+this.order.orderCode

pages_user/user/storeOrder.vue

@@ -11,7 +11,7 @@
 						@click="orderStatusChange(item)">
 						<view class="text">
 							{{ item.name }}
-							<image v-show="status ==item.value" class="tab-bg" src="https://kntobs.jnmyunl.com/shop/images/tab_bg.png" mode=""></image>
+							<image v-show="status ==item.value" class="tab-bg" src="https://jnlzjk-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/tab_bg.png" mode=""></image>
 						</view>
 					</view>
 				</view>
@@ -20,7 +20,7 @@
 			
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://kntobs.jnmyunl.com/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://jnlzjk-1323137866.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>
@@ -37,12 +37,13 @@
 						<view class="status-box">
 							<!-- <view   class="recom-box">推荐订单</view> -->
 							<text   class="text success">
-								{{utils.getDictLabelName("storeOrderStatus",item.status)}}
+								{{utils.getDictLabelName("storeOrderStatus",item.status)||''}}
 							</text>
 						</view>
 					</view>
-					<!-- 药品列表 -->
-					<view  class="drug-list"  >
+					<!-- 产品列表 -->
+					<!-- 商城 -->
+					<view  class="drug-list"  v-if="item.orderType!==2">
 						<view @click="showDetail(item)"  v-if="item.isPackage!=1" v-for="(subItem,subIndex) in item.items" :key="subIndex" class="drug-item" >
 							<view class="img-box">
 								<image :src="JSON.parse(subItem.jsonInfo).image" mode="aspectFill"></image>
@@ -57,7 +58,7 @@
 								<view class="num-box">
 									<view class="price">
 										<text class="unit">¥</text>
-										<text class="num">{{JSON.parse(subItem.jsonInfo).price.toFixed(2)}}</text>
+									<text class="num">{{JSON.parse(subItem.jsonInfo).price.toFixed(2)}}</text>
 									</view>
 									<view class="amount">x{{JSON.parse(subItem.jsonInfo).num}}</view>
 								</view>
@@ -97,6 +98,68 @@
 								<view v-if="item.status == 0" class="btn pay" @click="pay(item)">支付</view>
 								<view v-if="item.isAfterSales==1" class="btn cancel" @click="refund(item)">申请售后</view>
 								<view v-if="item.status >=2 &&item.deliveryId!=null" class="btn pay" @click.stop="showDelivery(item)">查看物流</view>
+								<view v-if="item.status == -3" class="btn cancel" @click="deleteOrder(item)">删除订单</view>
+								<!-- <view v-if="item.status==4" class="btn pay">再次购买</view> -->
+							</view>
+						</view>
+					</view>
+					<!-- 直播 -->
+					<view  class="drug-list"  v-if="item.orderType==2">
+						<view @click="showDetail(item)"  v-if="item.isPackage!=1" class="drug-item" >
+							<view class="img-box">
+								<image :src="JSON.parse(item.itemJson).image" mode="aspectFill"></image>
+							</view>
+							<view class="drug-info"  >
+								<view>
+									<view class="name-box ellipsis2">
+										<view v-if="item.isPrescribe==1" class="tag">处方药</view>{{JSON.parse(item.itemJson).productName}}
+									</view>
+									<view class="spec ellipsis2">{{JSON.parse(item.itemJson).sku}}</view>
+								</view>
+								<view class="num-box">
+									<view class="price">
+										<text class="unit">¥</text>
+									<text class="num">{{JSON.parse(item.itemJson).price.toFixed(2)}}</text>
+									</view>
+									<view class="amount">x{{item.totalNum}}</view>
+								</view>
+							</view>
+						</view>
+						<view v-if="item.isPackage==1&&item.packageJson!=null" class="drug-item" @click="showDetail(item)">
+							<view class="img-box">
+								<image :src="JSON.parse(item.packageJson).imgUrl" mode="aspectFill"></image>
+							</view>
+							<view class="drug-info"  >
+								<view>
+									<view class="name-box ellipsis2">
+										<view class="tag">套餐</view>{{JSON.parse(item.packageJson).title}}
+									</view>
+									<view class="spec ellipsis2">{{JSON.parse(item.packageJson).descs}}</view>
+								</view>
+								<!-- <view class="num-box">
+									<view class="price">
+										<text class="unit">¥</text>
+										<text class="num">{{JSON.parse(item.packageJson).payMoney.toFixed(2)}}</text>
+									</view>
+									<view class="amount"></view>
+								</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.payPrice.toFixed(2)}}</view>
+								</view>
+							</view>
+							<view class="btn-box">
+								<view v-if="item.status == 0" class="btn cancel" @click="cancel(item)">取消订单</view>
+								<view v-if="item.status == 0" class="btn pay" @click="pay(item)">支付</view>
+								<view v-if="item.isAfterSales==1" class="btn cancel" @click="refund(item)">申请售后</view>
+								<view v-if="item.status >=2 &&item.deliveryId!=null" class="btn pay" @click.stop="showDelivery(item)">查看物流</view>
+								<view v-if="item.status == -3" class="btn cancel" @click="deleteOrder(item)">删除订单</view>
 								<!-- <view v-if="item.status==4" class="btn pay">再次购买</view> -->
 							</view>
 						</view>
@@ -104,18 +167,14 @@
 				</view>
 			</view>
 		</mescroll-body>
-		<ykscreenRecord></ykscreenRecord>
 	</view>
 </template>
 
 <script>
-	import {getMyStoreOrderList,cancelOrder} from '@/api/storeOrder'
+	import {getMyStoreOrderList,cancelOrder,canceliveOrder, deleteOrder as deleteOrderApi, cancelLiveOrder} from '@/api/storeOrder'
+	import {getDicts} from '@/api/index'
 	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
-	import ykscreenRecord from "@/components/yk-screenRecord/yk-screenRecord.vue"
 	export default {
-		components:{
-			ykscreenRecord
-		},
 		mixins: [MescrollMixin], 
 		data() {
 			return {
@@ -139,7 +198,7 @@
 					},
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					empty: {
-						icon:'https://kntobs.jnmyunl.com/shop/images/no_data.png',
+						icon:'https://jnlzjk-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/no_data.png',
 						tip: '暂无数据'
 					}
 				},
@@ -149,6 +208,7 @@
 		},
 		onLoad(option) {
 			this.status = option.status
+			this.getDicts();
 			var that=this;
 			uni.$on('refreshOrder', () => {
 				that.mescroll.resetUpScroll()
@@ -159,10 +219,31 @@
 				this.searchKey=e.detail.value;
 				this.mescroll.resetUpScroll()
 			},
+			getDicts:function(){
+				getDicts().then(
+					res => {
+						if(res.code==200){
+							uni.setStorageSync('dicts',JSON.stringify(res));
+							
+						}else{
+							 
+						}
+						// this.loadding=false;
+						// this.navigatHandler();
+					},
+					rej => {}
+				);
+			},
 			refund(item) {
-				uni.navigateTo({
-					url: './refundOrderProduct?orderId='+item.id
-				})	
+				if(item.orderType==2){
+					uni.navigateTo({
+						url: '/pages_shopping/live/refundOrderProduct?orderId=' + item.orderId
+					})
+				}else{
+					uni.navigateTo({
+						url: './refundOrderProduct?orderId='+item.id
+					})	
+				}
 			},
 			// tab切换
 			orderStatusChange(item) {
@@ -206,13 +287,21 @@
 						that.mescroll.endErr();
 					}
 				});
+
 			},
 			// 查看订单详情
 			showDetail(item) {
 				console.log(item)
-				uni.navigateTo({
-					url: './storeOrderDetail?id=' + item.id
-				})
+				if(item.orderType==2){
+					uni.navigateTo({
+						url: '/pages_shopping/live/storeOrderDetail?orderId=' + item.orderId
+					})
+				}else{
+					uni.navigateTo({
+						url: './storeOrderDetail?id=' + item.id
+					})
+				}
+				
 			},
 			cancel(item){
 				var that=this;
@@ -222,9 +311,10 @@
 				    success: function (res) {
 				        if (res.confirm) {
 							var data = {
-								orderId:item.id
+								orderId:item.orderType==2?item.orderId:item.id
 							};
-							cancelOrder(data).then(res => {
+							if(item.orderType==2){
+							cancelLiveOrder(data).then(res => {
 								if(res.code==200){
 									uni.showToast({
 										icon:'success',
@@ -238,6 +328,23 @@
 									});
 								}
 							});
+							}else{
+								cancelOrder(data).then(res => {
+									if(res.code==200){
+										uni.showToast({
+											icon:'success',
+											title: "操作成功",
+										});
+										 that.mescroll.resetUpScroll()
+									}else{
+										uni.showToast({
+											icon:'none',
+											title: res.msg,
+										});
+									}
+								});
+							}
+							
 				        } 
 						else if (res.cancel) {
 							
@@ -252,16 +359,60 @@
 					});
 				}
 				else{
-					uni.navigateTo({
-						url: '/pages/shopping/paymentOrder?orderId='+item.id
-					})
+					if(item.orderType==2){
+						// 支付
+						console.log("去支付", item)
+						uni.navigateTo({
+							url: `/pages_shopping/live/paymentOrder?orderList=${encodeURIComponent(JSON.stringify(item))}`
+						})
+					}else{
+						uni.navigateTo({
+							url: '/pages/shopping/paymentOrder?orderId='+item.id
+						})
+					}
 				}
 			},
 			// 查看物流
 			showDelivery(item) {
-				uni.navigateTo({
-					url: './storeOrderDelivery?orderId='+item.id
-				})
+				if(item.orderType==2){
+					uni.navigateTo({
+						url: `/pages_shopping/live/storeOrderDelivery?orderId=${item.orderId}`
+					})
+				}else{
+					uni.navigateTo({
+						url: './storeOrderDelivery?orderId='+item.id
+					})
+				}
+			},
+			// 删除订单
+			deleteOrder(item) {
+				var that = this;
+				uni.showModal({
+					title: '提示',
+					content: '确定删除订单吗？删除后无法恢复',
+					success: function (res) {
+						if (res.confirm) {
+							var data = {
+								orderId: item.orderType == 2 ? item.orderId : item.id,
+								orderType: item.orderType
+							};
+							deleteOrderApi(data).then(res => {
+								if(res.code == 200){
+									uni.showToast({
+										icon:'success',
+										title: "删除成功",
+									});
+									that.mescroll.resetUpScroll()
+								}else{
+									uni.showToast({
+										icon:'none',
+										title: res.msg,
+									});
+								}
+							});
+						}
+					}
+				});
 			}
 			
 		}
@@ -382,7 +533,7 @@
 						font-family: PingFang SC;
 						font-weight: 500;
 						color: #FFFFFF;
-						background-image: url(https://kntobs.jnmyunl.com/shop/images/recom.png);
+						background-image: url(https://jnlzjk-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/recom.png);
 						background-repeat: no-repeat;
 						background-size: 100% 100%;
 						margin-right: 8upx;

pages_user/user/storeOrderDetail.vue

@@ -485,7 +485,7 @@
 <style lang="scss">
 	.fixed-top-box{
 		width: 100%;
-		//background: linear-gradient(135deg, #66b2ef 0%, #2BC7B9 100%);
+		background: linear-gradient(135deg, #2BC7B9 0%, #60CDC3 100%);
 		position: fixed;
 		top: 0;
 		left: 0;

pages_user/user/userTuiAdd.vue

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