运营活动~

common/config/config.js

@@ -4,8 +4,8 @@ if(process.env.NODE_ENV === 'development'){
 	// URL_CONFIG = 'http://192.168.1.33:8008'	 //俊俊联调地址
 	// URL_CONFIG = 'http://192.168.1.40:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.1.20:8008'	 //超超联调地址
-    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
-	URL_CONFIG = 'https://spi.caimei365.com'
+    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境
     URL_CONFIG = 'https://spi.caimei365.com'

h5/pages/activity/activity_mid.vue

@@ -158,7 +158,9 @@
 					})
 					this.isRequest = true
 					// 老郑你看下要不要加延时，可能会获取不到scrollTop
-					this.getSectionProps();
+					setTimeout(()=>{
+						this.getSectionProps();
+					},2000)
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})

pages.json

@@ -161,7 +161,12 @@
 		},{
 			"path": "pages/user/order/orderShareLogin",
 			"style": {
-				"navigationBarTitleText": "订单详情"
+				"navigationBarTitleText": "输入分享码"
+			}
+		},{
+			"path": "pages/user/order/order-sharelogin",
+			"style": {
+				"navigationBarTitleText": "查看订单"
 			}
 		},{
 			"path": "pages/user/order/myOrder",
@@ -211,11 +216,6 @@
 			"style": {
 				"navigationBarTitleText": "入驻咨询"
 			}
-		},{
-			"path": "pages/login/loginshare",
-			"style": {
-				"navigationBarTitleText": "查看订单"
-			}
 		},{
 			"path": "pages/login/apply",
 			"style": {

pages/login/apply.vue

@@ -394,10 +394,6 @@ import { mapMutations } from 'vuex';
 					this.$util.msg('请填写机构详细地址',2000);
 					return
 				}
-				if( this.socialCreditCode == ''){
-					this.$util.msg('请填写社会统一社会信用代码',2000);
-					return
-				}
 				if( this.uploadBusinessImage == ''){
 					this.$util.msg('请上传您的营业执照',2000);
 					return

pages/login/bindwechat.vue

@@ -185,9 +185,6 @@
 						}
 						// console.log(params)
 						bindingWechat(params).then(response =>{
-							console.log(this.isLoginType)
-							console.log(this.isLoginProductId)
-							console.log(this.isLoginOrderId)
 							switch(this.isLoginType){
 								case 9:
 									this.$api.navigateTo(`/h5/pages/activity/activity_mid`)

pages/user/order/create-order.vue

@@ -306,9 +306,12 @@
 						this.$api.navigateTo(`/pages/user/order/success?data=${JSON.stringify({data:data})}`)
 					}else if(response.code === 2){
 						this.submitState ='confirm'
-						this.$api.redirectTo(`/pages/user/order/order-payment?type=${this.submitState}&orderID=${response.data.orderID}`)
+						this.$util.msg('订单提交成功',3000,true,'success')
+						setTimeout(()=>{
+							this.$api.redirectTo(`/pages/user/order/order-payment?type=${this.submitState}&orderID=${response.data.orderID}`)
+						},3000)
 					}else{
-						this.$util.msg(response.msg,2000);
+						this.$util.msg(response.msg,3000);
 					}
 				}).catch(error =>{})
 			},

pages/user/order/order-payment.vue

@@ -3,7 +3,6 @@
 		<cu-custom :navbar-data='nvabarData' @navigateBack="hanldNavigateBack"></cu-custom>
 		<view class="container-cash clearfix">
 			<view class="container-wrapper">
-				<view class="pay-title" v-show="isConfirm"><text>订单提交成功，请支付订单</text></view>
 				<view class="pay-content">
 					<view class="pay-p"><text>待付金额</text></view>
 					<view class="pay-money">
@@ -94,7 +93,6 @@
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				tabCurrentIndex:0,
 				isShowTip:false,
-				isConfirm:false,
 				isReceiptStatus:false,
 				buttonText:'使用微信支付',
 				btnColor:'#09BB07',
@@ -134,14 +132,14 @@
 			initData(e){
 				switch(e.type){
 					case 'confirm':
-						this.isConfirm = true
 						this.nvabarData.haveBack = false
 						this.nvabarData.haveHome = true
+						this.nvabarData.title = '支付'
 						break;
 					case 'payfirm':
-						this.isConfirm = false
 						this.nvabarData.haveBack = true
 						this.nvabarData.haveHome = false
+						this.nvabarData.title = '选择支付方式'
 						break;
 				}
 				this.orderID = e.orderID

pages/login/loginshare.vue → pages/user/order/order-sharelogin.vue

@@ -5,7 +5,7 @@
 			<view class="main-list clearfix">
 				<view class="main-list-item" v-for="(item, index) in productList" :key="index">
 					<view class="item-image">
-						<image :src="item.mainImage" mode="widthFix"></image>
+						<image :src="item.productImage" mode="widthFix"></image>
 					</view>
 					<view class="item-mesage">
 						<view class="item-name">{{item.name}}</view>
@@ -45,20 +45,7 @@
 				userID:0,			//分享人的用户ID
 				isShareStatus:false,
 				serviceProviderId:'',
-				productList:[
-					{mainImage:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',name:'元泰Picocare皮秒激光美容仪皮秒激光调Q激光色素治疗养肤换肤祛除彩色纹身',num:1},
-					{mainImage:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',name:'元泰Picocare皮秒激光美容仪皮秒激光调Q激光色素治疗养肤换肤祛除彩色纹身',num:1},
-					{mainImage:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',name:'元泰Picocare皮秒激光美容仪皮秒激光调Q激光色素治疗养肤换肤祛除彩色纹身',num:1},
-					{mainImage:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',name:'元泰Picocare皮秒激光美容仪皮秒激光调Q激光色素治疗养肤换肤祛除彩色纹身',num:1},
-					{mainImage:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',name:'元泰Picocare皮秒激光美容仪皮秒激光调Q激光色素治疗养肤换肤祛除彩色纹身',num:1},
-					{mainImage:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',name:'元泰Picocare皮秒激光美容仪皮秒激光调Q激光色素治疗养肤换肤祛除彩色纹身',num:1},
-					{mainImage:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',name:'元泰Picocare皮秒激光美容仪皮秒激光调Q激光色素治疗养肤换肤祛除彩色纹身',num:1},
-					{mainImage:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',name:'元泰Picocare皮秒激光美容仪皮秒激光调Q激光色素治疗养肤换肤祛除彩色纹身',num:1},
-					{mainImage:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',name:'元泰Picocare皮秒激光美容仪皮秒激光调Q激光色素治疗养肤换肤祛除彩色纹身',num:1},
-					{mainImage:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',name:'元泰Picocare皮秒激光美容仪皮秒激光调Q激光色素治疗养肤换肤祛除彩色纹身',num:1},
-					{mainImage:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',name:'元泰Picocare皮秒激光美容仪皮秒激光调Q激光色素治疗养肤换肤祛除彩色纹身',num:1},
-					{mainImage:'https://img.caimei365.com/group1/M00/03/95/Cmis2F778GGALIeNAAGtOmuO4Sk263.jpg',name:'元泰Picocare皮秒激光美容仪皮秒激光调Q激光色素治疗养肤换肤祛除彩色纹身',num:1},
-				]
+				productList:[]
 			}
 		},
 		onLoad(e) {
@@ -93,11 +80,19 @@
 						}else if(response.code === -2){
 							this.$util.modal('提示',response.msg,'确定','',false,() =>{})
 						}else{
-							this.isShareStatus = true
+							this.getOrderCommodityData()
 						}
 					})
 				})
 			},
+			getOrderCommodityData(){
+				this.OrderService.OrderCommodityData({orderId:this.orderID}).then(response =>{
+					this.productList = response.data
+					this.isShareStatus = true
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			},
 			goLogin(index){
 				switch(index){
 					case 1:

seller/pages/login/apply.vue

@@ -495,10 +495,6 @@ import { mapMutations } from 'vuex';
 					this.$util.msg('请填写机构详细地址',2000);
 					return
 				}
-				if( this.socialCreditCode == ''){
-					this.$util.msg('请填写社会统一社会信用代码',2000);
-					return
-				}
 				if( this.uploadBusinessImage == ''){
 					this.$util.msg('请上传您的营业执照',2000);
 					return

seller/pages/login/register.vue

@@ -359,10 +359,6 @@
 						this.$util.msg('请填写机构详细地址',2000);
 						return
 					}
-					if( this.socialCreditCode == ''){
-						this.$util.msg('请填写社会统一社会信用代码',2000);
-						return
-					}
 					if( this.uploadBusinessImage == ''){
 						this.$util.msg('请上传您的营业执照',2000);
 						return

seller/pages/order/order-details.vue

@@ -186,7 +186,7 @@
 					// 来自页面内转发按钮
 			    }
 				return {
-					title: '您有新的分享订单，快来查看吧~',
+					title: '您有新的订单，请点击查看~',
 					path: `/pages/user/order/orderShareLogin?orderID=${this.orderID}&userID=${this.userID}&serviceProviderId=${this.serviceProviderId}`,
 					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
 				}

seller/pages/order/order-list.vue

@@ -384,7 +384,7 @@
 					// console.log(res.target)
 			    }
 				return {
-					title: '您有新的分享订单，快来查看吧~',
+					title: '您有新的订单，请点击查看~',
 					path: `/pages/user/order/orderShareLogin?orderID=${this.btnoRderID}&userID=${this.btnClubUserID}&serviceProviderId=${this.serviceProviderId}`,
 					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
 				}

services/ajax.env.js

@@ -4,8 +4,8 @@ if(process.env.NODE_ENV === 'development'){
 	// URL_CONFIG = 'http://192.168.1.33:8008'	 //俊俊联调地址
 	// URL_CONFIG = 'http://192.168.1.40:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.1.20:8008'	 //超超联调地址
-    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
-	URL_CONFIG = 'https://spi.caimei365.com'
+    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境
     URL_CONFIG = 'https://spi.caimei365.com'

services/index.js

@@ -1,3 +1,5 @@
+import Vue from 'vue'
+
 import ajaxService from './ajax.service.js'
 import CommonService from './common.service'
 import LocateService from './locate.service'
@@ -7,7 +9,9 @@ import PayService from './pay.service'
 import PhotoService from './photo.service'
 import SellerService from './sellse.service'
 import ActivityService from './activity.service'
-import Vue from 'vue'
+import OrderService from './order.service'
+
+
 let commonService = new CommonService(ajaxService)
 let locateService = new LocateService(ajaxService)
 let userService = new UserService(ajaxService)
@@ -16,6 +20,9 @@ let payService = new PayService(ajaxService)
 let photoService = new PhotoService(ajaxService)
 let sellerService = new SellerService(ajaxService)
 let activityService = new ActivityService(ajaxService)
+let orderService = new OrderService(ajaxService)
+
+
 Vue.prototype.AjaxService = ajaxService
 Vue.prototype.CommonService = commonService
 Vue.prototype.LocateService = locateService
@@ -25,3 +32,4 @@ Vue.prototype.PayService = payService
 Vue.prototype.PhotoService = photoService
 Vue.prototype.SellerService = sellerService
 Vue.prototype.ActivityService = activityService
+Vue.prototype.OrderService = orderService

services/order.service.js

@@ -0,0 +1,14 @@
+/**
+ * 这是与购物有关的业务逻辑的服务
+ */
+export default class OrderService {
+	constructor(AjaxService) {
+		Object.assign(this, { AjaxService })
+		this.name = 'OrderService'
+	}
+	/* 分享订单初始化查询 orderId 订单ID */
+	OrderCommodityData (data = {}) {
+		return this.AjaxService.get({ url:'/order/commodityData', data, isLoading: true })
+	}
+
+}