add

App.vue

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

common/request.js

@@ -6,7 +6,7 @@ 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 = 'https://userappB.kangniantangyiyao.top/store'//惠选和其他小程序
 		// let path = 'http://192.168.110.247:8113/store'
 		// let path2 = 'https://userapp.kangniantangyiyao.top'//直播
 		let path2 = 'http://192.168.110.59:8113'//本地（直播）

manifest.json

@@ -52,8 +52,8 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        // "appid" : "wx1de020b57c05a990",
-        "appid" : "wx06c66d8f7b8b01d0",
+        // "appid" : "wxd2892bb660356ecf",
+        "appid" : "wxd2892bb660356ecf",
         "setting" : {
             "urlCheck" : false
         },

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
 			}

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_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) {
@@ -136,6 +142,7 @@
 			getSalesOrder(item){
 				var that=this;
 				var data={createOrderKey:this.orderKey}
+				this.msg = ''
 				getSalesOrder(data).then(
 					res => {
 						if(res.code==200){
@@ -145,6 +152,7 @@
 							});
 							that.price.payPrice=res.totalMoney
 						}else{
+							this.msg =res.msg
 							uni.showToast({
 								icon:'none',
 								title: res.msg,

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/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>

store/index.js

@@ -22,10 +22,10 @@ export default new Vuex.Store({
 	 uploadFile: 'https://userapp.cqsft.vip',
 	imgpath: 'https://kntobs.jnmyunl.com',//惠选商城图片请求地址
 	// https://kntobs.jnmyunl.com/shop  惠选商城图片链接
-	logoname:'德信严选',
-	// appid:'wx1de020b57c05a990',//臻选
-	// appid:'wxd2edd379beb6581b',//惠选
-	appid:'wx06c66d8f7b8b01d0',//其他
+	logoname:'德信小站',
+	// appid:'wx1de020b57c05a990',//康年臻选
+	// appid:'wxd2edd379beb6581b',//康年惠选
+	appid:'wxd2892bb660356ecf',//其他
   },
   mutations: {
     setCount(state, value) {