瀏覽代碼

commit -m 拉机构上线

zhengjinyi 4 年之前
父節點
當前提交
4eb3ded7be

+ 17 - 17
main.js

@@ -31,25 +31,25 @@ Vue.prototype.$getStorage = function(key){
 /**
  * 友盟+小程序统计
  */
-if(process.env.NODE_ENV != 'development'){
+// if(process.env.NODE_ENV != 'development'){
 // #ifdef MP-WEIXIN
-	uma.init({
-		appKey: umtrackWxKey, //由友盟分配的APP_KEY
-		// 使用Openid进行统计,此项为false时将使用友盟+uuid进行用户统计。
-		// 使用Openid来统计微信小程序的用户,会使统计的指标更为准确,对系统准确性要求高的应用推荐使用Openid。
-		useOpenid: true,
-		// 使用openid进行统计时,是否授权友盟自动获取Openid,
-		// 如若需要,请到友盟后台"设置管理-应用信息"(https://mp.umeng.com/setting/appset)中设置appId及secret
-		autoGetOpenid: true,
-		debug: true, //是否打开调试模式
-		uploadUserInfo: false // 自动上传用户信息,设为false取消上传,默认为false
-	});
-	uma.install = function (Vue) {
-		Vue.prototype.$uma = uma;
-	}
-	Vue.use(uma);
+	// uma.init({
+	// 	appKey: umtrackWxKey, //由友盟分配的APP_KEY
+	// 	// 使用Openid进行统计,此项为false时将使用友盟+uuid进行用户统计。
+	// 	// 使用Openid来统计微信小程序的用户,会使统计的指标更为准确,对系统准确性要求高的应用推荐使用Openid。
+	// 	useOpenid: true,
+	// 	// 使用openid进行统计时,是否授权友盟自动获取Openid,
+	// 	// 如若需要,请到友盟后台"设置管理-应用信息"(https://mp.umeng.com/setting/appset)中设置appId及secret
+	// 	autoGetOpenid: true,
+	// 	debug: true, //是否打开调试模式
+	// 	uploadUserInfo: false // 自动上传用户信息,设为false取消上传,默认为false
+	// });
+	// uma.install = function (Vue) {
+	// 	Vue.prototype.$uma = uma;
+	// }
+	// Vue.use(uma);
 // #endif
-}
+// }
 
 // Vue实例化
 Vue.config.productionTip = false

+ 0 - 6
pages.json

@@ -211,12 +211,6 @@
 						"navigationBarTitleText": "登录"
 					}
 				},
-				{
-					"path": "bindemail",
-					"style": {
-						"navigationBarTitleText": "绑定邮箱"
-					}
-				},
 				{
 					"path": "binding",
 					"style": {

+ 0 - 243
pages/login/bindemail.vue

@@ -1,243 +0,0 @@
-<template>
-	<view class="container login">
-		<view class="login-main">
-			<text class="logo-text">您的账号尚未绑定机构邮箱,请填写机构邮箱地址进行绑定。邮箱可用于登录和修改密码。</text>
-		</view>
-		<view class="login-form clearfix">
-			<view class="login-input">
-				<input type="text" 
-					   v-model="bindEmail"  
-					   maxlength="30" 
-					   class="input" 
-					   placeholder="请输入邮箱地址"
-				/>
-			</view>
-		</view>
-		<view class="login-form clearfix">
-			<view class="login-input code">
-				<input type="number" 
-					   v-model="bindEmailCode"  
-					   maxlength="4" 
-					   class="input" 
-					   placeholder="请输入邮箱验证码"
-				/>
-			</view>
-			<view class="login-input btn" :class="[isEmialDisabled  ? 'disabled' : '']">
-				<button type="button"  
-						@click.stop="getEmailCodeFn"
-						:disabled="isEmialDisabled" 
-						class="input" >
-						{{ emailCodeText }}
-				</button>
-			</view>
-		</view>
-		<view class="login-form btns clearfix">
-			<view class="login-btn none"  @click="bindEmailNone">暂不绑定</view>
-			<view class="login-btn"  @click="bindEmailFrist">绑定</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import authorize from '@/common/config/authorize.js' 
-	import { bindingEmail } from '@/api/use.js' 
-	import { getEmailCode } from "@/api/utils.js"
-	import wxLogin from "@/common/config/wxLogin.js"
-	
-	export default{
-		data() {
-			return{
-				userID:'',			//用户ID
-				bindEmail:'',  		//用户绑定邮箱
-				bindEmailCode:'',  	//用户绑定邮箱验证码
-				isEmialDisabled:false,	//获取验证码按钮
-				count: '',				//倒计时
-				emailCodeText: '获取验证码',
-				codeTime: null,
-				codeType:'',		//用户状态 为4状态的跳绑定微信
-				getOption:'',			//储存上一级页面的option
-				loginType:'',		//跳转类型
-				loginPath:'',		//从哪个页面跳的
-				alertText:'',
-				id:''//商品ID
-			}
-		},
-		onLoad(option) {
-			if(option.data){
-				let data = JSON.parse(option.data);
-				this.getOption = data
-				this.loginType = data.type;
-			}
-			this.loginPath = option.pathType
-			this.codeType = option.codeType
-		},
-		methods:{
-			bindEmailFrist(){
-				 let params = {
-						userID:this.userID,
-						email:this.bindEmail,
-						code:this.bindEmailCode
-				}
-				bindingEmail(params).then(response =>{
-					if(this.loginPath == 1){
-						wxLogin.wxLoginAuthorize()
-						this.$api.switchTabTo('/pages/tabBar/user/user')
-					}else{
-						this.$api.navigateTo(`/pages/login/bindwechat?data=${JSON.stringify(this.getOption)}&type=${this.loginType}`)
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			bindEmailNone(){
-				if(this.loginPath == 1){
-					wxLogin.wxLoginAuthorize()
-					this.$api.switchTabTo('/pages/tabBar/user/user')
-				}else{
-					this.$api.navigateTo(`/pages/login/bindwechat?data=${JSON.stringify(this.getOption)}&type=${this.loginType}`)
-				}
-			},
-			getEmailCodeFn(){
-				if( this.bindEmail == ''){
-					this.$util.msg('请输入邮箱地址',2000);
-					return
-				}
-				if(!this.$reg.isEmail(this.bindEmail)){
-					this.$util.msg('请输入正确的邮箱地址',2000);
-					return
-				}
-				this.isEmialDisabled = true;	
-				getEmailCode({email:this.bindEmail,status:1}).then(res =>{
-					this.$util.msg('邮箱验证码已发送',2000)
-					const TIME_COUNT = 60;
-			     	if (!this.codeTime) {
-			       		this.count = TIME_COUNT;
-						this.isEmialDisabled = true;
-			       		this.codeTime = setInterval(() => {
-			       			if (this.count > 1 && this.count <= TIME_COUNT) {
-			         			this.count--
-			         			this.emailCodeText = this.count +'s重新发送'
-			        		} else {
-				         		this.isEmialDisabled = false;
-				         		clearInterval(this.codeTime)
-				         		this.codeTime = null
-								this.emailCodeText = '获取验证码'
-			        		}
-			       		},1000)
-			      	}
-				}).catch( error =>{
-					this.$util.msg(error.msg,2000);
-					this.isEmialDisabled = false;
-				})
-			}
-		},
-		onShow() {
-			this.$api.getStorage().then((resolve) => {
-				this.userID = resolve.userId
-			})
-		}
-	}
-</script>
-
-<style lang="scss">
-	.login{
-		width: 100%;
-		height: auto;
-		border-top: 1px solid #F7F7F7;
-		.model-warp.none{
-			display: none;			
-		}
-		.model-warp.show{
-			display: block;
-		}
-		.login-main{
-			width: 702rpx;
-			background: rgba(225, 86, 22, 0.1);
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			height: 68rpx;
-			padding: 20rpx 24rpx;
-			margin: 24rpx 0 118rpx 0;
-			.logo-text{
-				font-size: 24rpx;
-				line-height: 34rpx;
-				color: $color-system;
-			}
-		}
-		.login-form{
-			width: 702rpx;
-			height: auto;
-			padding: 0 24rpx;
-			&.btns{
-				display: flex;
-				margin-top: 80rpx;
-				.login-btn{
-					flex:1;
-					width: 303rpx;
-					height: 88rpx;
-					margin: 0 24rpx;
-					border-radius: 44rpx;
-					font-size: $font-size-28;
-					line-height: 88rpx;
-					color: #FFFFFF;
-					text-align: center;
-					background: $btn-confirm;
-					&.none{
-						background: #999999;
-						color: #FFFFFF;
-					}
-				}
-			}
-			.login-input{
-				width: 654rpx;
-				height: 40rpx;
-				padding: 24rpx;
-				margin-bottom: 20rpx;
-				background: #F7F7F7;
-				border-radius: 14rpx;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				&.code{
-					width: 377rpx;
-					float: left;
-					margin-right: 20rpx;
-				}
-				&.btn{
-					width: 258rpx;
-					height: 88rpx;
-					padding: 0;
-					float: left;
-					background: $btn-confirm;
-					.input{
-						width: 258rpx;
-						height: 88rpx;
-						line-height: 88rpx;
-						padding: 0;
-						border-radius: 14rpx;
-						color: #FFFFFF;
-						background: $btn-confirm;
-						
-					}
-					&.disabled{
-						background: #F7F7F7;
-						.input{
-							background: #F7F7F7;
-							color: #999999;
-						}
-					}
-				}
-				.input{
-					width: 100%;
-					height: 100%;
-					background: #F7F7F7;
-					font-size: $font-size-28;
-					line-height: 40rpx;
-					color: #333333;
-					border-radius: 14rpx;
-				}
-			}
-		}
-	}
-</style>

+ 1 - 29
seller/pages/club/list.vue

@@ -31,34 +31,6 @@
 			</view>
 			<view v-else class="club-list">
 				<scroll-view scroll-y="true" >
-					<!-- <view class="list" v-for="(item, index) in clubList" :key="index">
-						<view class="list-left">
-							<view class="list-head">
-								<image :src="item.headpic ? item.headpic : 'https://static.caimei365.com/app/img/icon/icon-club@3x.png'" mode=""></image>
-							</view>
-							<view class="list-tel">
-								<text class="txt">{{item.userIdentity ===2 ? item.name : item.linkMan}}</text>
-								<text class="txt sm">
-									<text class="txt-le">{{item.linkMan ? item.linkMan : ''}}</text>
-									{{item.contractMobile ? item.contractMobile : ''}}</text>
-							</view>
-						</view>
-						<view class="list-opea">
-							<view class="opea-type-dell or" @click.stop="orderHistory(item)">
-								<text class="iconfont icon-dingdanxuanzhong"></text>
-								<text>历史订单</text>
-								<text v-if="item.orderNum >0"
-									  class="opea-badge uni-badge uni-badge-error uni-small uni-badge--small icon-num"
-									  :class="[item.orderNum < 10 ? 'right':'']">
-									  {{showBadge(item.orderNum)}}
-								</text>
-							</view>
-							<view class="opea-type-dell" @click.stop="checkData(item)">
-								<text class="iconfont icon-xieboke"></text>
-								<text>修改资料</text>
-							</view>
-						</view>
-					</view> -->
 					<view class="list" v-for="(item, index) in clubList" :key="index">
 						<view class="list-logo">
 							<image :src="item.headpic ? item.headpic : 'https://static.caimei365.com/app/img/icon/icon-club@3x.png'" mode=""></image>
@@ -78,7 +50,7 @@
 										  {{showBadge(item.orderNum)}}
 									</text>
 								</view>
-								<button open-type="share" class="btn yel" @click.stop="shareBindClub">分享登录</button>
+								<button open-type="share" class="btn yel" @click.stop="shareBindClub(item)">分享登录</button>
 							</view>
 						</view>	
 					</view>		

+ 2 - 2
seller/pages/login/register-general.vue

@@ -110,10 +110,10 @@
 				}
 				this.SellerService.SellerClubRegister(this.params).then(response =>{
 					this.$util.msg('注册成功',2000);
-					// this.clubInfo.userId = response.data.userId
+					this.clubInfo.userId = response.data
 					setTimeout(()=>{
 						this.isRegisterStep = false
-						this.GetClubUserInfo(11162)
+						this.GetClubUserInfo(this.clubInfo.userId)
 					},1500)
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);

+ 16 - 6
seller/pages/login/register-member.vue

@@ -8,7 +8,7 @@
 			</view>
 			<view class="main-form-item">
 				<view class="form-label">手机号</view>
-				<input class="form-input phone" type="text" v-model="params.contractMobile" placeholder="请输入联系人手机号" maxlength="11"/>
+				<input class="form-input phone" type="text" v-model="params.bindMobile" placeholder="请输入联系人手机号" maxlength="11"/>
 				<view class="form-btn" @click.stop="CheckMobile()">检测</view>
 			</view>
 			<view class="main-form-item">
@@ -229,7 +229,7 @@
 			<view class="main-form-item none">
 				<view class="form-label none">主营内容</view>
 				<view class="form-checkbox-group">
-					<view class="form-table-item" v-for="(item, index) in medicaCampList" :key="index">
+					<view class="form-table-item" v-for="(item, index) in showMainProductList" :key="index">
 						{{ item.name }}
 					</view>
 				</view>
@@ -298,6 +298,7 @@
 				],
 				current:0,
 				customItemValue:'', 	//自定义项目
+				showMainProductList:[]
 			}
 		},
 		filters: {
@@ -395,19 +396,20 @@
 				}
 				this.SellerService.SellerClubRegister(this.params).then(response =>{
 					this.$util.msg('提交成功',2000);
-					this.clubInfo.userId = response.data.userId
+					this.clubInfo.userId = response.data
 					setTimeout(()=>{
 						this.isRegisterStep = false
-						this.GetClubUserInfo(response.data.userId)
+						this.GetClubUserInfo(this.clubInfo.userId)
 					},2000)
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);
 				})
 			},
 			GetClubUserInfo(userId){
-				this.UserService.OrganizationUpdateModifyInfo({userId:11162})
+				this.UserService.OrganizationUpdateModifyInfo({userId:userId})
 				.then(response =>{
 					this.clubInfo = response.data.club
+					this.showMainProductList =  this.setNewMainpro(this.clubInfo.mainProduct)
 				})
 				.catch(error =>{
 					this.$util.msg(error.msg,2000)
@@ -508,6 +510,14 @@
 					current: 0
 				});
 			},
+			setNewMainpro(arr){//回显处理主营内容
+				let _ARRAY = []
+				arr.split('/').forEach((item,index) =>{
+					let _OBJ = {value:(index+1).toString(),name:item,checked:true}
+					_ARRAY.push(_OBJ)
+				})
+				return _ARRAY
+			},
 			bindPickerChange(e) {//选择机构类型
 				this.params.firstClubType = Number(e.target.value);
 			},
@@ -590,7 +600,7 @@
 			}
 		},
 		onShow() {
-			this.GetClubUserInfo()
+			
 		}
 	}
 </script>

+ 0 - 626
seller/pages/order/myOrder.vue

@@ -1,626 +0,0 @@
-<template>
-	<view class="container" :style="{paddingTop:navbarHeight+'px'}">
-		<!-- 自定义返回 -->
-		<header-back :systeminfo='systeminfo' :navbar-data='nvabarData' :headerBtnPosi ="headerBtnPosi" :isDelete="isDelete"></header-back>
-		<view class="container-order">
-			<view class="search-input">
-				<template>
-					<view class="gosearch-btn" @click="goSearch()">
-						<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-						<text>美白/润肤</text>
-					</view>
-				</template>
-			</view>
-			<!--选项卡逻辑自己实现即可,此处未做处理-->
-			<tui-tabs :tabs="tabs" 
-					  :isFixed="scrollTop>=0" 
-					  :currentTab="currentTab" 
-					  selectedColor="$color-system" 
-					  sliderBgColor="$color-system"
-					  @change="change"
-					  :marginTop="navbarHeight">
-			</tui-tabs>
-			<view  :class="{'tui-order-list':scrollTop >= 0}" class="clearfix">
-				<!-- 空白页 -->
-				<empty v-if="isEmpty" :typeIndex="currentTab" :navbarHeight="navbarHeight"></empty>
-				<!-- 列表 -->
-				<view v-else class="tui-order-content">
-					<view  class="tui-order-item" v-for="(order,orderIndex) in orderData" :key="orderIndex" >
-						<view class="order-title">
-							<view class="order-title-t">
-								<view class="order-title-num">订单号:{{order.orderNo}}</view>
-								<view class="order-title-tip">{{orderStateExp(order.status)}}</view>
-							</view>
-							<view class="order-title-b">下单时间:{{order.orderTime}}</view>
-						</view>
-						<block v-for="(item,index) in order.shopOrderList" :key="index">
-							<view class="goods-title">
-								<view class="title-logo"><image :src="item.shopLogo" mode=""></image></view>
-								<view class="title-text">{{item.shopName}}</view>
-							</view>
-							<view class="goods-item" v-for="(pros,prosIndex) in item.cmOrderProducts" :key="prosIndex" @click.stop="detail(order.orderID)">
-								<view class="goods-pros-t">
-									<view class="pros-img"><image :src="pros.productImage" alt="" /></view>
-									<view class="pros-product">
-										<view class="producttitle">{{pros.name}}</view>
-										<view class="productspec">规格:{{pros.productUnit}}</view>
-										<view class="productprice">
-											<view class="price">
-												<text>¥{{pros.price}}</text>
-											</view>
-											<view class="count">
-												<text class="small">x</text>{{pros.num}}
-											</view>
-										</view>
-									</view>	
-								</view>
-							</view>	
-						</block>
-						<view class="order-footer">
-							<view class="order-footer-top" v-if="order.discountFee!=0">经理折扣:¥{{orderPriceToFixed(order.discountFee)}}</view>
-							<view class="order-footer-bot">
-								<view class="count">共{{order.productCount}}件商品</view>
-								<view class="money">合计:¥{{orderPriceToFixed(order.payableAmount)}}</view>
-							</view>
-						</view>
-						<!-- 底部button -->
-						<order-button ref="orderButton" 
-									  :status="order.status" 
-									  :orderID="order.orderID" 
-									  @buttonConfirm="handButtonConfirm">
-						</order-button>
-					</view>
-					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
-					<!--加载loadding-->
-				</view>
-			</view>
-		</view>
-		<!-- 分享弹窗 -->
-		<share-alert   v-if="isShareModal"
-					   :orderID="btnoRderID" 
-					   @shareConfirm ='onShareAppMessage'>
-		</share-alert>
-		<!-- 删除订单弹窗 -->
-		<model-alert v-if="isShowDelModal"
-					 :alertText='alertText'
-					 @btnConfirm ='handOrderDetele'>
-		</model-alert>
-		<!-- 取消订单弹窗 -->
-		<cancel-alert v-if="isCenceModal"
-					 :cenceAlertText='cenceAlertText'
-					 @cenceConfirm ='handCenceConfirm'>
-		</cancel-alert>
-		<!-- 透明模态层 -->
-		<modal-layer v-if='isModalLayer'></modal-layer>
-	</view>
-</template>
-
-<script>
-	import headerBack from '@/components/cm-module/headerNavbar/header-back' 		 	 //自定义导航
-	import tuiTabs from "@/components/tui-components/tui-tabs/tui-tabs"
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import orderButton from '@/components/cm-module/orderDetails/orderListButton'		 //按钮
-	import modalLayer from "@/components/modal-layer"
-	import empty from "@/components/empty";
-	import shareAlert from '@/components/cm-module/modelAlert/shareAlert'			 //分享弹窗
-	import modelAlert from '@/components/cm-module/modelAlert/modelAlert'			 //删除弹窗
-	import cancelAlert from '@/components/cm-module/modelAlert/cancelAlert'		 //取消弹窗
-	export default {
-		components: {
-			empty,
-			tuiTabs,
-			tuiLoadmore,
-			tuiNomore,
-			orderButton,
-			modalLayer,
-			modelAlert,
-			shareAlert,
-			cancelAlert,
-			headerBack
-		},
-		data() {
-			return {
-				userID:0,
-				orderData: [],
-				btnoRderID: 0, //点击按钮传入的的订单ID
-				currentTab: 0,
-				pageNum: 1,	  //页数
-				pageSize: 10,  //条数
-				scrollTop: 0,
-				deteleType:'',
-				skeletonShow: true,
-				isEmpty: false,
-				isDelete:false,
-				isShareModal: false,//控制分享弹窗
-				isCenceModal: false,//控制取消订单弹窗
-				isShowDelModal: false,//控制删除订单弹窗
-				isModalLayer: false,
-				loadding: false,
-				pullUpOn: true,
-				hasNextPage: false,
-				pullFlag: true,
-				navbarHeight:'',
-				alertText: '确认删除订单吗?',
-				cenceAlertText: '确认取消该订单吗?',
-				nomoreText: '上拉显示更多',
-				tabs: [
-					{name: "全部"},
-					{name: "待付款"}, 
-					{name: "待发货"}, 
-					{name: "已发货"}, 
-					{name: "退货/款"},
-				],
-				headerBtnPosi:	this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
-				systeminfo:  this.setSysteminfo(),		 //获取设备信息
-				nvabarData: {							 //顶部自定义导航
-					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示
-					title: '我的订单', // 导航栏 中间的标题
-				}
-			}
-		},
-		onLoad(option) {
-			if(option.type ==='detele'){this.isDelete = true}
-			this.currentTab = option.state
-			this.getHeaderTopHeight()//设置自定义导航高度
-		},
-		methods: {
-			getOrderDatainit(index){
-				/**
-				 * @订单初始化加载  仅加载第一页码
-				 * @param:orderState(订单状态:0全部,1待付款,2待发货,3已发货,4退货款)
-				 * @param:userID(用户ID)
-				 * @param:index(页码数)
-				 * @param:pageSize(每页条数)
-				 * @param:organizeID(全局变量组织ID)
-				 */ 
-				// setTimeout(()=>{this.skeletonShow = false},1500)
-				this.$api.getStorage().then((resolve) =>{
-					this.userID = resolve.userId ? resolve.userId : 0
-					let param = {orderState:index,userID:this.userID,index:1,pageSize:this.pageSize,organizeID:this.userOrganizeID}
-					this.$api.lodingGet('/order/myOrder',param,
-						response => {
-							if(response.code === '1'){
-								let resData = response.data.results
-								this.hasNextPage = response.data.hasNextPage;
-								if(resData && resData.length > 0){
-									this.isEmpty = false;
-									this.orderData = [...resData];
-								}else{
-									this.isEmpty = true
-								}
-								if(this.hasNextPage){
-									this.pullUpOn = false
-									this.nomoreText = '上拉显示更多'
-								}else{
-									if(this.orderData.length < 2){
-										this.pullUpOn = true
-									}else{
-										this.pullUpOn = false
-										this.nomoreText = '已至底部'
-									}
-								}
-							}else{
-								this.$util.msg(response.msg,2000);
-							}
-						}
-					)	
-				})	
-			}, 
-			getOnReachBottomData(index){//上拉加载
-				this.pageNum+=1
-				let param = {orderState:index,userID:this.userID,index:this.pageNum,pageSize:this.pageSize,organizeID:this.userOrganizeID}
-				this.$api.get('/order/myOrder',param,
-					response => {
-						if(response.code === '1'){
-							let resData = response.data.results
-							this.hasNextPage = response.data.hasNextPage;
-							this.orderData = this.orderData.concat(resData)
-							this.pullFlag = false;// 防上拉暴滑
-							setTimeout(()=>{this.pullFlag = true;},500)
-							if(this.hasNextPage){
-								this.pullUpOn = false
-								this.nomoreText = '上拉显示更多'
-							}else{
-								this.loadding = false
-								this.pullUpOn = false
-								this.nomoreText = '已至底部'
-							}
-						}else{
-							this.$util.msg(response.msg,2000);
-						}
-					}
-				)	
-			},
-			change(e) {//切换tab传递当前tab[index]执行初始化方法
-				this.currentTab = e.index
-				this.pageNum = 1
-				this.orderData = []
-				this.pullUpOn = true //切换时隐藏
-				this.loadding =  false //切换时隐藏
-				this.getOrderDatainit(this.currentTab)
-			},
-			detail(id) {//订单详情跳转
-				this.isModalLayer = true;	
-				this.$api.navigateTo(`/pages/user/order/order-details?state=${this.currentTab}&orderID=${id}`)
-			},
-			handButtonConfirm(data) {//获取点击
-				this.handShowAlert(data)
-				this.btnoRderID = data.orderId
-			},
-			handShowAlert(data) {//执行
-				switch(data.type){
-					case 'delete':
-						this.isShowDelModal = true;
-						break
-					case 'cancel':
-						this.isCenceModal = true;
-						break
-					case 'query':
-						this.isModalLayer = true;
-						this.$api.navigateTo('/pages/user/order/order-logistics?orderID='+data.orderId)
-						break
-					case 'confirm':
-						this.handOrderConfirm(data.orderId);
-						break
-				}
-			},
-			handOrderConfirm (id){//确认收货
-				this.$api.get('/order/affirm',{orderID:id},
-					response => {
-						if(response.code === '1'){
-							this.$util.msg(response.msg,2000,true,'success');
-							this.isShowDelModal = false
-							setTimeout(() => {
-								this.getOrderDatainit(this.currentTab)
-							},2000)
-						}else{
-							this.$util.msg(response.msg,2000);
-						}
-					}
-				)
-			},
-			handOrderDetele (){//删除订单
-				this.$api.get('/order/delete',{orderID:this.btnoRderID},
-					response => {
-						if(response.code === '1'){
-							this.$util.msg(response.msg,2000,true,'success');
-							this.isShowDelModal = false
-							setTimeout(() => {
-								this.orderData = [];
-								this.getOrderDatainit(this.currentTab)
-							},2000)
-						}else{
-							this.$util.msg(response.msg,2000);
-						}
-					}
-				)
-			},
-			handCenceConfirm (){//取消订单
-				this.$api.get('/order/cancel',{orderID:this.btnoRderID},
-					response => {
-						if(response.code === '1'){
-							this.$util.msg(response.msg,2000,true,'success');
-							this.isCenceModal = false
-							setTimeout(() => {
-								this.orderData = [];
-								this.getOrderDatainit(this.currentTab)
-							},2000)
-						}else{
-							this.$util.msg(response.msg,2000);
-						}
-					}
-				)
-			},
-			onShareAppMessage (res){//分享转发
-				this.isShareModal = false
-				if (res.from === 'button') {// 来自页面内转发按钮
-			    }
-				return {
-					title: '您有新的分享订单,快来查看吧~',
-					path: `/pages/user/order/order-sharelogin?orderID=${this.btnoRderID}&userID=${this.userID}`,
-					imageUrl:'https://static.caimei365.com/app/img/bg/min-banner.jpg'
-				}
-			},
-			//订单状态文字和颜色
-			orderStateExp (state){
-				let stateText = '',
-					stateTextObject={
-						4:'交易完成',
-						5:'订单完成',
-						6:'已关闭',
-						7:'交易全退',
-						77:'交易全退',
-						11:'待付款待发货',
-						12:'待付款部分发货',
-						13:'待付款已发货',
-						21:'部分付款待发货',
-						22:'部分付款部分发货',
-						23:'部分付款已发货',
-						31:'已付款待发货',
-						32:'已付款部分发货',
-						33:'已付款已发货',
-						111:'待付款待发货',
-					}
-				Object.keys(stateTextObject).forEach(key => {
-					if(key == state){
-						stateText = stateTextObject[key]
-					}
-				})
-				return stateText;
-			},
-			orderPriceToFixed (n){
-				let price ='';
-				price = n.toFixed(2);
-				return price
-			},
-			getHeaderTopHeight (){ // 状态栏高度
-				let statusBarHeight = this.systeminfo.statusBarHeight
-				let headerPosi = this.headerBtnPosi
-				let btnPosi = { // 胶囊实际位置,坐标信息不是左上角原点
-				      height: headerPosi.height,
-				      width: headerPosi.width,
-				      // 胶囊top - 状态栏高度
-				      top: headerPosi.top - statusBarHeight,
-				      // 胶囊bottom - 胶囊height - 状态栏height (现胶囊bottom 为距离导航栏底部的长度)
-				      bottom: headerPosi.bottom - headerPosi.height - statusBarHeight,
-				      // 屏幕宽度 - 胶囊right
-				      right: this.systeminfo.screenWidth - headerPosi.right
-				}
-				this.navbarHeight= headerPosi.bottom + btnPosi.bottom// 原胶囊bottom + 现胶囊bottom
-			},
-			setHeaderBtnPosi (){
-				// 获得胶囊按钮位置信息
-				let headerBtnPosi = uni.getMenuButtonBoundingClientRect();
-				return headerBtnPosi
-			},
-			setSysteminfo (){
-				let systeminfo;
-				uni.getSystemInfo({ // 获取设备信息
-					success: (res) => {
-						systeminfo = res
-					},
-				})
-				return systeminfo
-			}
-		},
-		// onPullDownRefresh() {
-		// 	if(!this.isEmpty){
-		// 		setTimeout(() => {
-		// 			this.pageNum = 1,
-		// 			this.getOrderDatainit(this.currentTab)
-		// 			uni.stopPullDownRefresh()				
-		// 		}, 200);
-		// 	}
-		// },
-		onReachBottom() {//上滑加载更多
-			if(this.hasNextPage){
-				this.loadding = true
-				this.pullUpOn = true
-				this.getOnReachBottomData(this.currentTab);
-			}	
-		},
-		onPageScroll(e) {
-			this.scrollTop = e.scrollTop;
-		},
-		onShow() {
-			this.isModalLayer = false;	
-			this.getOrderDatainit(this.currentTab)
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background: #F7F7F7;
-	}
-	.container {
-		padding-bottom: env(safe-area-inset-bottom);
-		height: auto;
-		position: relative;
-	}
-	.tui-order-content{
-		width: 100%;
-		height: auto;
-	}
-	.tui-order-list {
-		margin-top: 80rpx;
-		width: 100%;
-		position: relative;
-	}
-	.tui-order-item {
-		display: flex;
-		flex-direction: column;
-		width: 702rpx;
-		padding:20rpx 24rpx 0 24rpx;
-		background: #fff;
-		border-bottom: 20rpx solid #F7F7F7;
-	}
-	.search-input{
-		width: 100%;
-		height: 80rpx;
-		margin-bottom: 20rpx;
-		.gosearch-btn{
-			/* #ifndef APP-NVUE */
-			display: flex;
-			/* #endif */
-			flex: 1;
-			flex-direction: row;
-			justify-content: center;
-			align-items: center;
-			width: 662rpx;
-			height: 100%;
-			border-radius: 40rpx;
-			background: #F7F7F7;
-			margin: 0 auto;
-			padding:0 20rpx;
-			font-size: 28rpx;
-			line-height: 80rpx;
-			color: #8A8A8A;
-			.icon-iconfonticonfontsousuo1{
-				margin:0 6rpx;
-				font-size: 34rpx;
-				color: #F29857;
-				z-index: 10;
-			}
-		}
-	}
-	.order-title{
-		width: 100%;
-		height: auto;
-		.order-title-t{
-			width: 100%;
-			height: 40rpx;
-			float: left;
-			font-size: $font-size-28;
-			line-height: 40rpx;
-			font-weight: bold;
-			.order-title-num{
-				float: left;
-				text-align: left;
-				color: $color-system;
-			}
-			.order-title-tip{
-				float: right;
-				text-align: right;
-				color: #FF2A2A;
-			}
-		}
-		.order-title-b{
-			width: 100%;
-			height: 40rpx;
-			float: left;
-			margin-top: 8rpx;
-			font-size: $font-size-28;
-			line-height: 40rpx;
-			color: #999999;
-			text-align: left;
-		}
-	}
-	.goods-title{
-		width: 100%;
-		height: 48rpx;
-		float: left;
-		margin-top: 24rpx;
-		.title-logo{
-			width: 48rpx;
-			height: 48rpx;
-			float: left;
-			image{
-				width: 48rpx;
-				height: 48rpx;
-			}
-		}
-		.title-text{
-			float: left;
-			margin-left: 16rpx;
-			font-size: $font-size-28;
-			color: $text-color;
-			text-align: left;
-			line-height: 48rpx;
-			font-weight: bold;
-		}
-	}
-	.goods-item{
-		width: 100%;
-		height: auto;
-	}	
-	.goods-pros-t{
-		display: flex;
-		align-items: center;
-		width: 100%;
-		height: 217rpx;
-		padding:24rpx 0;
-		.pros-img{
-			width: 210rpx;
-			height: 100%;
-			border-radius: 10rpx;
-			margin:0 26rpx 0 0;
-			border:1px solid #f3f3f3;
-			image{
-				width: 100%;
-				height: 100%;
-				border-radius: 10rpx;
-			}
-		}
-	}
-	.pros-product{
-		width: 468rpx;
-		height: 100%;
-		line-height: 36rpx;
-		font-size: $font-size-26;	
-		position: relative;
-		.producttitle{
-			width: 100%;
-			display: inline-block;
-			height: auto;							
-			text-overflow:ellipsis;
-			display: -webkit-box;
-			word-break: break-all;
-			-webkit-box-orient: vertical;
-			-webkit-line-clamp: 2;
-			overflow: hidden;
-			margin-bottom: 8rpx;
-		}
-		.productspec{
-			height: 36rpx;
-			color: #999999;
-		}
-		.productprice{
-			height: 48rpx;
-			position: absolute;
-			width: 100%;
-			bottom: 0;
-			.price{
-				line-height: 48rpx;
-				font-size: $font-size-28;
-				width: 48%;
-				color: #FF2A2A;
-				float: left;
-				font-weight: bold;
-			}
-			.count{
-				height: 100%;
-				float: right;
-				position: relative;
-				.small{
-					color: #666666;
-				}
-			}
-		}
-	}
-	.order-footer{
-		width: 100%;
-		height: 78rpx;
-		float: left;
-		.order-footer-top{
-			width: 100%;
-			height: 34rpx;
-			line-height: 34rpx;
-			font-size: $font-size-24;
-			color: #999999;
-			text-align: right;
-		}
-		.order-footer-bot{
-			width: 100%;
-			float: left;
-			height: 48rpx;
-			line-height: 48rpx;
-			font-size: $font-size-28;
-			font-weight: bold;
-			color: $text-color;
-			.count{
-				width: 50%;
-				float: left;
-				text-align: left;
-			}
-			.money{
-				width: 50%;
-				float: right;
-				text-align: right;
-			}
-		}
-	}
-</style>

+ 2 - 2
services/ajax.env.js

@@ -9,7 +9,7 @@ if(process.env.NODE_ENV === 'development'){
 	// URL_CONFIG = 'http://192.168.2.81:8008'
 }else{
     // 生产环境
-	// 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'
 }
 export default URL_CONFIG

+ 2 - 1
services/config.env.js

@@ -6,6 +6,7 @@ if(process.env.NODE_ENV === 'development'){
 	URL_CONFIG = 'https://core-b.caimei365.com'
 }else{
     // 生产环境
-	URL_CONFIG = 'https://core.caimei365.com'
+	// URL_CONFIG = 'https://core.caimei365.com'
+	URL_CONFIG = 'https://core-b.caimei365.com'
 }
 export default URL_CONFIG