提交修改

App.vue

@@ -73,7 +73,6 @@
 		},
 		 
 		methods: {
-			
 			checkUpdate() {
 				const updateManager = uni.getUpdateManager();
 				updateManager.onCheckForUpdate(function(res) {

api/storeOrder.js

@@ -82,4 +82,9 @@ let request = new Request().http
  // 删除订单
  export function deleteOrder(data) {
  	return request('/app/order/deleteOrder', data, 'POST', 'application/json;charset=UTF-8');
+ }
+ 
+ // 检查限购
+ export function checkContinue(data) {
+ 	return request('/app/storeOrder/checkContinue', data, 'POST', 'application/json;charset=UTF-8');
  }

manifest.json

@@ -53,7 +53,7 @@
     /* 小程序特有相关 */
     "mp-weixin" : {
         // "appid" : "wx1de020b57c05a990",
-        "appid" : "wx1de020b57c05a990",
+        "appid" : "wx06c66d8f7b8b01d0",
         "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/confirmOrder.vue

@@ -141,7 +141,7 @@
 <script>
 	import {getWeixinOrderTemps} from '@/api/common'
 	import ykscreenRecord from "@/components/yk-screenRecord/yk-screenRecord.vue"
-	import {confirm,computed,create} from '@/api/storeOrder'
+	import {confirm,computed,create,checkContinue} from '@/api/storeOrder'
 	import { getMyEnableCouponList } from '@/api/coupon'
 	import EvanSwitch from '@/components/evan-switch/evan-switch.vue'
 	import popupBottom from '@/components/px-popup-bottom/px-popup-bottom.vue'
@@ -306,17 +306,46 @@
 					});
 					return;
 				}
-				
-				uni.requestSubscribeMessage({
-					tmplIds: this.temps,
-					success(res) {
-						 that.createOrder();
-					},
-					fail(res) {
-						that.createOrder();
+				let productInfo=this.carts.map(item => {
+					return {
+					productId: item.productId,
+					num: item.cartNum
+					};
+				});
+				const data={
+					type:1,
+					productInfo:productInfo
+				}
+				checkContinue(data).then(res=>{
+					console.log(res)
+					if(res.code==200){
+						uni.requestSubscribeMessage({
+							tmplIds: this.temps,
+							success(res) {
+								 that.createOrder();
+							},
+							fail(res) {
+								that.createOrder();
+							}
+						})
+					}else{
+						if (res.msg.length >14) {
+						  uni.showModal({
+						    title: '提示',
+						    content: res.msg,
+						    showCancel: false,
+						    confirmText: '我知道了'
+						  })
+						} else {
+						  uni.showToast({
+						    title: res.msg,
+						    icon: 'none'
+						  })
+						}
 					}
 				})
 				
+				
 			},
 			createOrder(){
 				var that=this;

pages/user/index.vue

@@ -124,7 +124,7 @@
 								<image src="https://kntobs.jnmyunl.com/shop/images/qualification.png" mode=""></image>
 								<text class="text">资质证书</text>
 							</view>
-							<view class="item no-marin-bottom align-top" @click="navgetTo('/pages_course/livingList')">
+							<!-- <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>
@@ -135,7 +135,7 @@
 									src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/live.png"
 									mode=""></image>
 								<text class="text">直播订单</text>
-							</view>
+							</view> -->
 							<view class="item no-marin-bottom" @click="toManager()">
 								<image src="https://kntobs.jnmyunl.com/shop/images/products_icon.png" mode=""></image>
 								<text class="text">制单管理</text>

pages_company/couponDetails.vue

@@ -29,7 +29,7 @@
           </view>
         </view>
         <view class="tui-btn-box">
-			<view class="btn cancel" v-if='CompanyUserInfo' @click="showpop(item)">发送</view>
+			<view class="btn cancel" v-if='isShare!=1' @click="showpop(item)">发送</view>
 			<view class="btn cancel" v-if="item.receiveCount>0">已领取</view>
 			<view class="btn cancel" v-else-if="item.receiveCount==item.totalCount" >已领完</view>
 			<view class="btn receive" v-else @click="receive(item.id,index)">立即领取</view>
@@ -67,6 +67,7 @@
 </template>
 <script>
 import { getCouponIssueById, receive,sendCoupon,searchUser} from '@/api/coupon'
+	import { mapGetters } from 'vuex';
 export default {
   name: 'getCoupon',
  
@@ -104,7 +105,8 @@ export default {
 	  })
   	return {
   		title: this.item.couponName,
-  		path: `/pages_company/couponDetails?isShare=1&id=${this.item.id}`
+  		path: `/pages_company/couponDetails?isShare=1&id=${this.item.id}`,
+		imageUrl:this.logoimg
   	}
   },
   mounted: function() {
@@ -113,6 +115,17 @@ export default {
 	  this.CompanyUserInfo=uni.getStorageSync('CompanyUserInfo');
 	  this.user=uni.getStorageSync('userInfo');
   },
+  computed: {
+  	...mapGetters(['logoimg']),
+  },
+  watch: {
+      logoimg: {
+        immediate: true,          // 页面一进入就检查一次
+        handler(val) {
+  		  return val
+        }
+      },
+  },
   methods: {
 	  sendpop(id){
 	  	this.sendCoupon(id)

pages_company/order/confirmCompanyOrder.vue

@@ -44,9 +44,9 @@
 						<text class="num">{{price.totalPrice.toFixed(2)}}</text>
 					</view>
 				</view>
-				<view class="btn" @click="openUpdateMoney()" >
+				<!-- <view class="btn" @click="openUpdateMoney()" >
 					实收金额
-				</view>
+				</view> -->
 				<view class="btn"  >
 					分享
 					<button  class="share" data-name="shareBtn" open-type="share">分享</button>

pages_company/storeOrderDetail.vue

@@ -220,15 +220,15 @@
 				支付分享
 				<button  class="share" data-name="shareBtn" open-type="share">分享</button>
 			</view>
-			<view class="btn share-btn" v-if="order.status==0" @click="openEditMoney()">
+			<!-- <view class="btn share-btn" v-if="order.status==0" @click="openEditMoney()">
 				修改定金
-			</view>
+			</view> -->
 		</view>
 	 
 		<view class="popup-box" v-if="editShow">
 		  <view class="info-mask"  @tap="cancelEditMoney()" ></view>
 		  <view class="info-form"   >
-				<view class="title">修改订金</view>
+				<!-- <view class="title">修改订金</view> -->
 				<view class="form-box">
 					<view class="form-item">
 						<text class="label">支付金额</text>

pages_shopping/shopping/confirmCreateOrder.vue

@@ -134,13 +134,14 @@
 			 </view>
 			 
 		</popupBottom>
+		<ykscreenRecord></ykscreenRecord>
 	</view>
 </template>
 
 <script>
 	import {getWeixinOrderTemps} from '@/api/common'
-	
-	import {confirm,computed,create} from '@/api/storeOrder'
+	import ykscreenRecord from "@/components/yk-screenRecord/yk-screenRecord.vue"
+	import {confirm,computed,create,checkContinue} from '@/api/storeOrder'
 	import { getMyEnableCouponList } from '@/api/coupon'
 	 
 	import EvanSwitch from '@/components/evan-switch/evan-switch.vue'
@@ -149,7 +150,8 @@
 	export default {
 		components: {
 			EvanSwitch,
-			popupBottom
+			popupBottom,
+			ykscreenRecord
 		},
 		data() {
 			return {
@@ -304,16 +306,53 @@
 					});
 					return;
 				}
-				
-				uni.requestSubscribeMessage({
-					tmplIds: this.temps,
-					success(res) {
-						 that.createOrder();
-					},
-					fail(res) {
-						that.createOrder();
+				let productInfo=this.carts.map(item => {
+					return {
+					productId: item.productId,
+					num: item.cartNum
+					};
+				});
+				const data={
+					type:1,
+					productInfo:productInfo
+				}
+				checkContinue(data).then(res=>{
+					console.log(res)
+					if(res.code==200){
+						uni.requestSubscribeMessage({
+							tmplIds: this.temps,
+							success(res) {
+								 that.createOrder();
+							},
+							fail(res) {
+								that.createOrder();
+							}
+						})
+					}else{
+						if (res.msg.length >14) {
+						  uni.showModal({
+						    title: '提示',
+						    content: res.msg,
+						    showCancel: false,
+						    confirmText: '我知道了'
+						  })
+						} else {
+						  uni.showToast({
+						    title: res.msg,
+						    icon: 'none'
+						  })
+						}
 					}
 				})
+				// uni.requestSubscribeMessage({
+				// 	tmplIds: this.temps,
+				// 	success(res) {
+				// 		 that.createOrder();
+				// 	},
+				// 	fail(res) {
+				// 		that.createOrder();
+				// 	}
+				// })
 				
 			},
 			createOrder(){

pages_shopping/shopping/confirmPackageOrder.vue

@@ -121,7 +121,7 @@
 
 <script>
 	import {getWeixinTemps} from '@/api/common'
-	import {confirmPackageOrder,computedPackageOrder,createPackageOrder} from '@/api/storeOrder'
+	import {confirmPackageOrder,computedPackageOrder,createPackageOrder,checkContinue} from '@/api/storeOrder'
 	import { getMyEnableCouponList } from '@/api/coupon'
 	 
 	import EvanSwitch from '@/components/evan-switch/evan-switch.vue'
@@ -256,16 +256,47 @@
 					});
 					return;
 				}
-				
-				uni.requestSubscribeMessage({
-					tmplIds: this.temps,
-					success(res) {
-						 that.createPackageOrder();
-					},
-					fail(res) {
-						that.createPackageOrder();
+				const data={
+					type:2,
+					packageId:this.packageId
+				}
+				checkContinue(data).then(res=>{
+					console.log(res)
+					if(res.code==200){
+						uni.requestSubscribeMessage({
+							tmplIds: this.temps,
+							success(res) {
+								that.createPackageOrder();
+							},
+							fail(res) {
+								that.createPackageOrder();
+							}
+						})
+					}else{
+						if (res.msg.length >14) {
+						  uni.showModal({
+						    title: '提示',
+						    content: res.msg,
+						    showCancel: false,
+						    confirmText: '我知道了'
+						  })
+						} else {
+						  uni.showToast({
+						    title: res.msg,
+						    icon: 'none'
+						  })
+						}
 					}
 				})
+				// uni.requestSubscribeMessage({
+				// 	tmplIds: this.temps,
+				// 	success(res) {
+				// 		 that.createPackageOrder();
+				// 	},
+				// 	fail(res) {
+				// 		that.createPackageOrder();
+				// 	}
+				// })
 				
 				
 			},

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>