冲突文件

components/Server.vue

@@ -0,0 +1,43 @@
+<template>
+	<view>
+		<view class="serve">
+			<image class="w130 h130"
+				src="/static/images/server.png"
+				mode=""></image>
+			<text class="text">官方客服</text>
+			<button class="contact-btn" open-type="contact"></button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"Server",
+		data() {
+			return {
+
+			};
+		}
+	}
+</script>
+
+<style  lang="scss" scoped>
+.serve{
+	position: fixed;
+	right: 20rpx;
+	top: 80%;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	z-index: 9;
+	.text{
+		margin-top: 10rpx;
+		font-weight: 500;
+		font-size: 24rpx;
+		color: #333;
+		background: rgba(255, 255, 255, 0.8);
+		padding: 8rpx 16rpx;
+		border-radius: 20rpx;
+	}
+}
+</style>

pages/home/index.vue

@@ -195,8 +195,8 @@
 				<view class="inner">
 					<view class="pub-tab-box">
 						<view class="tab-inner">
-							<view 
-								v-for="(item,index) in articleCateList" 
+							<view
+								v-for="(item,index) in articleCateList"
 								:key="index"
 								:class="item.cateId == cateId?'item active':'item'"
 								@click="articleCateChange(item)">
@@ -208,7 +208,7 @@
 						</view>
 						<image class="right-mask" src="https://jnlzjk-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/mask.png" mode=""></image>
 					</view>
-					 
+
 					<view class="know-list">
 						<view class="item" v-for="(item,index) in articleList" :key="index" @click="showArticle(item)">
 							<view class="left">
@@ -248,7 +248,7 @@
 				<view class="text ellipsis">关注公众号了解更新</view>
 			</view>
 			<view class="btn">查看</view>
-			
+
 		</view> -->
 		<!-- #ifdef MP-WEIXIN -->
 		<view class="official-account">
@@ -263,6 +263,9 @@
 		</view>
 		<z-modal :show="tuiModalControl" placeholderText="请输入邀请码" :btnGroup="btnGroup" :contentType="2"
 			titleText="填写邀请码" @cancle="cancleTui" @sure="submitTui"></z-modal>
+
+
+			<Server/>
 		<!-- <tabbar :actindex="0"></tabbar> -->
 	</view>
 </template>
@@ -304,6 +307,8 @@
 	import HotProduct from './components/HotProduct.vue'
 	import NewProduct from './components/NewProduct.vue'
 	import TuiProduct from '@/components/tuiProduct.vue'
+
+	import Server from '@/components/Server.vue'
 	import {
 		getUserInfo,
 		bindPromoter
@@ -315,7 +320,8 @@
 			Menu,
 			HotProduct,
 			NewProduct,
-			TuiProduct
+			TuiProduct,
+			Server
 		},
 		data() {
 			return {
@@ -706,7 +712,7 @@
 					if (res.code == 200) {
 						// for (var i = 0; i < res.data.length; i++) {
 						// 	const item=res.data[i];
-						// if(item.menuName.indexOf('百域百科')>=0 || item.menuName.indexOf('百域自测')>=0 
+						// if(item.menuName.indexOf('百域百科')>=0 || item.menuName.indexOf('百域自测')>=0
 						// || item.menuName.indexOf('百域档案')>=0 ||item.menuName.indexOf('用药咨询')>=0){
 						// 	this.menus.push(item);
 						// }
@@ -2679,4 +2685,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/user/index.vue

@@ -32,7 +32,7 @@
 							<view class="msg-box" @click="navgetTo('/pages_user/user/message')">
 								<image src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/icon-msg.png" mode=""></image>
 							</view>
-							
+
 						</uni-badge> -->
 					</view>
 				</view>
@@ -122,18 +122,7 @@
 									mode=""></image>
 								<text class="text">我的足迹</text>
 							</view>
-							<!-- <view class="item no-marin-bottom" @click="openH5('/h5/userAgreement')">
-								<image
-									src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/service_file.png"
-									mode=""></image>
-								<text class="text">用户协议</text>
-							</view> -->
-							<!-- <view class="item no-marin-bottom align-top" @click="openH5('/h5/privacyPolicy')">
-								<image
-									src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/advice.png"
-									mode=""></image>
-								<text class="text">隐私保护</text>
-							</view> -->
+
 							<view class="item no-marin-bottom">
 								<image
 									src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/customer1.png"
@@ -156,19 +145,15 @@
 								<text class="text">资质证书</text>
 							</view> -->
 							<!-- v-if="user.bindCompanyUserId" -->
-							<!-- <view v-if="user.bindCompanyUserId"  class="item no-marin-bottom align-top" @click="navgetTo('/pages_course/livingList')">
-								<image
-									src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/integral.png"
-									mode=""></image>
-								<text class="text">直播</text>
-							</view> -->
-							<view v-if="user.bindCompanyUserId" class="item no-marin-bottom" @click="navgetTo('/pages_shopping/live/order')">
+							<view  class="item no-marin-bottom" @click="navgetTo('/pages_shopping/live/order')">
 								<image
 									src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/live.png"
 									mode=""></image>
 								<text class="text">直播订单</text>
 							</view>
-							<view  v-if="user.bindCompanyUserId" class="item no-marin-bottom" @click="toManager()">
+
+							<!-- 销售可见 -->
+							<!-- <view  v-if="user.bindCompanyUserId" class="item no-marin-bottom" @click="toManager()">
 								<image
 									src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/products_icon.png"
 									mode=""></image>
@@ -179,6 +164,41 @@
 									src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/sale_file.png"
 									mode=""></image>
 								<text class="text">销售管理</text>
+							</view> -->
+
+							<!-- <view v-if="user.bindCompanyUserId" class="item no-marin-bottom" @click="openH5('/h5/userAgreement')">
+								<image
+									src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/service_file.png"
+									mode=""></image>
+								<text class="text">用户协议</text>
+							</view> -->
+							<!-- <view v-if="user.bindCompanyUserId" class="item no-marin-bottom align-top" @click="openH5('/h5/privacyPolicy')">
+								<image
+									src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/advice.png"
+									mode=""></image>
+								<text class="text">隐私保护</text>
+							</view> -->
+
+
+							<!-- 测试用下面的 -->
+							<view  class="item no-marin-bottom align-top" @click="navgetTo('/pages_course/livingList')">
+								<image
+									src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/integral.png"
+									mode=""></image>
+								<text class="text">直播</text>
+							</view>
+
+							<view class="item no-marin-bottom" @click="toManager()">
+								<image
+									src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/products_icon.png"
+									mode=""></image>
+								<text class="text">制单管理</text>
+							</view>
+							<view class="item no-marin-bottom" @click="toManagerCourse()">
+								<image
+									src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/sale_file.png"
+									mode=""></image>
+								<text class="text">销售管理</text>
 							</view>
 						</view>
 					</view>
@@ -199,6 +219,7 @@
 			</view>
 
 		</view>
+		<Server/>
 	</view>
 </template>
 
@@ -210,9 +231,11 @@
 		getUserInfo
 	} from '@/api/user'
 	import likeProduct from '@/components/likeProduct.vue'
+	import Server from '@/components/Server.vue'
 	export default {
 		components: {
-			likeProduct
+			likeProduct,
+			Server
 		},
 		data() {
 			return {
@@ -661,4 +684,4 @@
 		margin: 10px;
 		border-radius: 20rpx;
 	}
-</style>
+</style>

pages_course/living.vue

@@ -163,7 +163,7 @@
 
 					<!-- 底部输入和操作区域 -->
 					<view class="input-actions-container" :class="{ 'input-actions-focused': isFocus }">
-						<view class="input-container" :class="{ 
+						<view class="input-container" :class="{
 									'input-container-focused': isFocus,
 									'input-container-normal': !isFocus
 								}">
@@ -190,8 +190,8 @@
 										src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/userapp/images/more-icon.png"
 										class="action-icon" /> -->
 
-									<image :src="liveItem.showType == 1 
-										    ? '/static/images/more2.png' 
+									<image :src="liveItem.showType == 1
+										    ? '/static/images/more2.png'
 										    :'https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/userapp/images/more-icon.png'"
 										class="action-icon" />
 								</view>
@@ -1214,7 +1214,7 @@
 										this.isLogin = true
 										this.haveLogin()
 										// console.log("TOKEN_KEYAuto",TOKEN_KEYAuto)
-										// this.getIsAddKf() 
+										// this.getIsAddKf()
 									} else {
 										uni.showToast({
 											title: res.msg,
@@ -3903,7 +3903,9 @@
 								msg: socketMessage.msg,
 								status: true
 							};
-						} else if (socketMessage.cmd == 'LotteryDetail') {
+						} else if (socketMessage.cmd == 'deleteMsg') {
+
+						}else if (socketMessage.cmd == 'LotteryDetail') {
 							try {
 								this.prizeInfo = Array.isArray(JSON.parse(socketMessage.data || '[]')) ? JSON.parse(
 									socketMessage.data || '[]') : [];
@@ -5418,6 +5420,7 @@
 					}
 
 					.action-label {
+						color:#1e1e1e;
 						text-align: center;
 						margin-top: 10rpx;
 					}
@@ -5673,4 +5676,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages_shopping/live/order.vue

@@ -55,23 +55,26 @@
 							<text v-else-if="item.status==3">已完成</text>
 							<text v-else-if="item.status==-3">已取消</text>
 						</view>
-						<view class="order-main" v-for="(itm,idx) in item.orderItemList" :key="idx">
+						 <!-- v-for="(itm,idx) in item.orderItemList" :key="idx" -->
+						<!-- <view >{{JSON.parse(item.itemJson).description}}</view>
+						 <view >{{JSON.parse(item.itemJson).imgUrl}}</view> -->
+						<view class="order-main">
 							<view class="img-box">
-								<image :src="itm.imgUrl"></image>
+								<image :src="JSON.parse(item.itemJson).image"></image>
 							</view>
 							<view class="order-text">
-								<view class="title">{{itm.productName}}</view>
+								<view class="title">{{JSON.parse(item.itemJson).productName}}</view>
 								<view class="txt">适用于乏力、头晕等人群，通过问诊可明确诊断给予专业性指导意见。</view>
 								<view class="num">
-									<text>{{itm.sales}} 人已购</text>
-									<text class="grey">x{{itm.num}}</text>
+									<text>{{JSON.parse(item.itemJson).sales}} 人已购</text>
+									<text class="grey">x{{JSON.parse(item.itemJson).totalNum}}</text>
 								</view>
 							</view>
 						</view>
 						<view class="order-bottom">
 							<view class="order-money">
 								<text class="title">订单金额：</text>
-								<text class="num">￥<text class="bold">{{item.totalPrice}}</text></text>
+								<text class="num">￥<text class="bold">{{item.payPrice}}</text></text>
 							</view>
 							<view class="button-group">
 								<view v-if="item.status == 0" @click.stop="cancel(item)" class="button cancel ">取消订单
@@ -583,4 +586,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages_shopping/live/storeOrderDelivery.vue

@@ -3,7 +3,7 @@
 		<view class="top-cont">
 			<!-- 背景图片 -->
 			<image class="bg" src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/userapp/images/order_top_bg2.png" mode=""></image>
-			<view class="top-inner">			
+			<view class="top-inner">
 				<!-- 这里是状态栏 -->
 				<view class="status_bar" :style="{height: statusBarHeight}"></view>
 				<view class="back-box" @click="back">
@@ -12,13 +12,13 @@
 					<text></text>
 				</view>
 				<!-- 运单号 -->
-				<view class="waybill-number">
+				<!-- <view class="waybill-number">
 					<view class="itemlistall">
 						<view v-for="(item,index) in ExpressMulti" :key="index" @click="xuanze(index)"
 						 :class="actexpress==index?'itemlist itemact':'itemlist' " >
 							物流{{index+1}}</view>
 					</view>
-					
+
 					<view class="inner">
 						<view class="num-box">
 							<text class="text">运单号</text>
@@ -27,6 +27,18 @@
 						</view>
 						<view class="kf-box">
 							<text class="text">{{expressList.ShipperName}}</text>
+						</view>
+					</view>
+				</view> -->
+				<view class="waybill-number">
+					<view class="inner">
+						<view class="num-box">
+							<text class="text">运单号</text>
+							<text class="text">{{deliveryId}}</text>
+							<view class="copy" @click="copyOrderSn(deliveryId)">复制</view>
+						</view>
+						<view class="kf-box">
+							<text class="text">{{express.name}}</text>
 							<!-- <text class="text">客服电话：95311</text> -->
 						</view>
 					</view>
@@ -46,16 +58,16 @@
 							<view  class="desc-text">
 								{{item.AcceptStation}}
 							</view>
-							 
+
 							<view class="time">{{item.AcceptTime}}</view>
 						</view>
 					</view>
 				</view>
-				
+
 			</view>
-			
+
 		</view>
-		
+
 	</view>
 </template>
 
@@ -76,7 +88,8 @@
 		onLoad(option) {
 			console.log(option)
 			this.orderId=option.orderId;
-			this.getExpresslists()
+			// this.getExpresslists()
+			this.getExpress()
 		},
 		methods: {
 			xuanze(index){
@@ -89,25 +102,25 @@
 					if(res.code==200){
 						this.ExpressMulti=res.data
 						this.expressList=res.data[this.actexpress]
-						
+
 					}
 				})
 			},
 			getExpress(){
 				var data={orderId:this.orderId};
-				
+
 				getExpress(data).then(res => {
 					if(res.code==200){
 						this.express=res.express;
 						this.expressList=res.data;
 						this.deliveryId=res.deliveryId
-				 
+
 					}else{
 						uni.showToast({
 							icon:'none',
 							title: "请求失败",
 						});
-						 
+
 					}
 				});
 			},
@@ -241,7 +254,7 @@
 					}
 				}
 			}
-			
+
 		}
 	}
 	.content{
@@ -333,7 +346,7 @@
 				}
 			}
 		}
-		
+
 	}
-	
+
 </style>

pages_shopping/live/storeOrderDetail.vue

@@ -320,16 +320,16 @@
 				return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 			},
 			openDetails(item) {
-				console.log(item)
+				console.log(item.productId)
 				uni.navigateTo({
-					url: '/pages_shopping/shopping/productDetails?productId=' + item.productId
-				})
-			},
-			addPrescribe() {
-				uni.navigateTo({
-					url: "/pages/shopping/prescribe?orderId=" + this.order.id
+					url: '/pages_shopping/live/goods?productId=' + item.productId
 				})
 			},
+			// addPrescribe() {
+			// 	uni.navigateTo({
+			// 		url: "/pages/shopping/prescribe?orderId=" + this.order.id
+			// 	})
+			// },
 			showImg() {
 				var imgArr = [];
 				imgArr.push(this.prescribe.rpUrl)
@@ -884,4 +884,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages_user/user/storeOrderDetail.vue

@@ -25,7 +25,7 @@
 			<!-- 背景图片 -->
 			<image class="bg" src="https://jnlzjk-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/order_top_bg.png" mode=""></image>
 			<view class="top-inner">
-				
+
 				<!-- 顶部固定后站位元素 -->
 				<view style="padding-bottom: 88upx;">
 					<view :style="{height: statusBarHeight}"></view>
@@ -119,7 +119,7 @@
 				<view class="content">
 					<!-- 产品列表 -->
 					<view class="goods-list">
-						<view v-if="order.isPackage!=1" v-for="(item,index) in items" :key="index" class="item" @click="openDetails(item)">
+						<view v-if="order.isPackage!=1" v-for="(item,index) in items" :key="index" class="item" @click="openDetails(item.productId)">
 							<view class="img-box">
 								<image :src="JSON.parse(item.jsonInfo).image" mode="aspectFill"></image>
 							</view>
@@ -140,7 +140,7 @@
 								</view>
 							</view>
 						</view>
-						<view  v-if="order.isPackage==1&&order.packageJson!=null"   class="item"  >
+						<view  v-if="order.isPackage==1&&order.packageJson!=null"   class="item" >
 							<view class="img-box">
 								<image :src="JSON.parse(order.packageJson).imgUrl" mode="aspectFill"></image>
 							</view>
@@ -151,10 +151,10 @@
 									</view>
 									<view class="spec ellipsis2">{{JSON.parse(order.packageJson).descs}}</view>
 								</view>
-								 
+
 							</view>
 						</view>
-					 
+
 						<!-- 已优惠、小计 -->
 						<view class="sub-total">
 							<view class="discount">
@@ -194,7 +194,7 @@
 							<text class="label">优惠金额</text>
 							<text class="text" v-if="order.couponPrice!=null">-¥{{order.couponPrice.toFixed(2)}}</text>
 						</view>
-						
+
 						<view   class="item">
 							<text class="label">应付金额</text>
 							<text class="text" v-if="order.payPrice!=null">¥{{order.payPrice.toFixed(2)}}</text>
@@ -215,7 +215,7 @@
 							<text class="label">发货时间</text>
 							<text class="text"></text>
 						</view> -->
-						 
+
 					</view>
 					<!-- 处方信息 -->
 					<view class="order-info" v-if="order.isPrescribe&&prescribe!=null">
@@ -241,7 +241,7 @@
 						</view>
 					</view>
 				</view>
-				
+
 			</view>
 		</view>
 		<!-- 按钮 -->
@@ -316,7 +316,7 @@
 							icon:'none',
 							title: res.msg,
 						});
-						 
+
 					}
 				}).catch(()=>{
 					this.loading = false
@@ -324,8 +324,9 @@
 				});
 			},
 			openDetails(item){
+				console.log(item)
 				uni.navigateTo({
-					url: '/pages/shopping/productDetails?productId='+item.productId
+					url: '/pages/shopping/productDetails?productId='+item
 				})
 			},
 			addPrescribe(){
@@ -358,7 +359,7 @@
 							icon:'none',
 							title: "请求失败",
 						});
-						 
+
 					}
 				}).catch(()=>{
 					uni.hideLoading()
@@ -391,7 +392,7 @@
 									});
 								}
 							});
-				        } 
+				        }
 						else if (res.cancel) {
 				        }
 				    }
@@ -418,7 +419,7 @@
 									});
 								}
 							});
-				        } 
+				        }
 						else if (res.cancel) {
 				        }
 				    }
@@ -453,7 +454,7 @@
 						url:"/pages/common/launch"
 					})
 				}
-				
+
 			},
 			// 复制订单编号
 			copyOrderSn(text) {
@@ -617,7 +618,7 @@
 						}
 					}
 				}
-				
+
 			}
 		}
 	}