commit -m 开发

common/config/addressdata.js

@@ -3,11 +3,16 @@
  *已提供给地区选择picker组件使用
  */
 import { queryAddressInformation } from '@/services/public.js'
+import ajaxService from '@/services/ajax.service.js'
+import PublicService from '@/services/public.service'
+
+const _PublicService = new PublicService(ajaxService)
+
 const provinceData = []
 const cityData = []
 const areaData = []
 
-queryAddressInformation().then(res => {
+_PublicService.GetAllAddressData().then(res =>{
 	let list = res.data
 	list.forEach(item => {
 		let xxx = handleCitys(item)
@@ -53,7 +58,7 @@ queryAddressInformation().then(res => {
 		})
 		return x
 	}
-
+	
 	function handleData3(data) {
 		const xxx = []
 		data.forEach(item => {
@@ -67,7 +72,6 @@ queryAddressInformation().then(res => {
 		})
 		return xxx
 	}
-
 })
 module.exports = {
 	provinceData,

common/config/utilsTools.js

@@ -3,7 +3,7 @@
  * @Author Zhengjingyi
  * @Action 全局公共方法
  */
-import requestUrl from '@/services/config.env.js'
+import requestUrl from '@/services/ajax.env.js'
 const caimeiApi = {
 	/**
 	 * @封装公共get数据请求方法无加载动画

common/config/wxLogin.js

@@ -1,61 +1,61 @@
 import store from '@/store/index.js'
 import authorize from '@/common/config/authorize.js'
-import {
-	userInfoLogin
-} from '@/services/user.service.js'
+import ajaxService from '@/services/ajax.service.js'
+import UserService from '@/services/user.service'
+
+const newUserService = new UserService(ajaxService)
+
 // 根据微信的code获取用户登录状态:1已登录过 -1未登录过
-const wxLoginAuthorize = function() {
-	authorize.getCode('weixin').then(wechatcode => {
-		console.log('code:' + wechatcode)
-		authorize.getUserInfo('weixin').then(wxResponse => {
-			userInfoLogin({
-				code: wechatcode
-			}).then(response => {
-				store.commit('updateStatus', response.data)
-				store.commit('login', response.data)
-			}).catch(error => {
-				console.log(error)
-				store.commit('logout', error.data)
-				store.commit('updateStatus', error.data)
-			})
-		})
+const wxLoginAuthorize = async function(){
+	const wechatCode = await authorize.getCode('weixin');// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
+	const getUserInfo = await authorize.getUserInfo('weixin');
+	newUserService.userInfoLogin({ 
+		code:wechatCode,
+		encryptedData:getUserInfo.encryptedData,
+		iv:getUserInfo.iv
+	})
+	.then(response =>{
+		store.commit('updateStatus',response.data)
+		store.commit('login',response.data);
+		uni.setStorageSync('token',response.data.token)
+		uni.setStorageSync('unionId',response.data.unionId)
+	})
+	.catch(error =>{
+		uni.setStorageSync('unionId',error.data.unionId)
+		store.commit('logout',error.data)
+		store.commit('updateStatus',error.data)
 	})
 }
-const wxLoginQuick = function() { // 根据微信的code获取用户登录状态:1已登录过 -1未登录过跳转
-	authorize.getCode('weixin').then(wechatcode => {
-		// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
-		authorize.getUserInfo('weixin').then(wxResponse => {
-			userInfoLogin({
-				code: wechatcode,
-				encryptedData: wxResponse.encryptedData,
-				iv: wxResponse.iv
-			}).then(response => {
-				console.log(response)
-				store.commit('updateStatus', response.data)
-				store.commit('login', response.data)
-				store.commit('wxLogin', wxResponse.userInfo)
-				if (response.data.userIdentity == 1) {
-					uni.navigateTo({
-						url: '/seller/pages/index/index'
-					})
-				} else if (response.data.userIdentity === 3) {
-					uni.navigateTo({
-						url: '/supplier/pages/index/index'
-					})
-				} else {
-					uni.switchTab({
-						url: '/pages/tabBar/user/user'
-					})
-				}
-			}).catch(error => {
-				store.commit('logout', error.data)
-				store.commit('updateStatus', error.data)
-				store.commit('wxLogin', wxResponse.userInfo)
-			})
+const wxLoginQuick = async function(){// 根据微信的code获取用户登录状态:1已登录过 -1未登录过跳转
+		const wechatCode = await authorize.getCode('weixin');// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
+		const getUserInfo = await authorize.getUserInfo('weixin');
+		const params = 
+		newUserService.userInfoLogin({ 
+			code:wechatCode,
+			encryptedData:getUserInfo.encryptedData,
+			iv:getUserInfo.iv
+		})
+		.then(response =>{
+			console.log(response)
+			store.commit('updateStatus',response.data)
+			store.commit('login',response.data);
+			uni.setStorageSync('token',response.data.token)
+			uni.setStorageSync('unionId',response.data.unionId)
+			if(response.data.userIdentity ==1){
+				uni.navigateTo({url:'/seller/pages/index/index'})
+			}else if(response.data.userIdentity === 3){
+				uni.navigateTo({url:'/supplier/pages/index/index'})
+			}else{
+				uni.switchTab({url:'/pages/tabBar/user/user'})
+			}
+		})
+		.catch(error =>{
+			uni.setStorageSync('unionId',error.data.unionId)
+			store.commit('logout',error.data)
+			store.commit('updateStatus',error.data)
 		})
-	})
 }
-export default {
+export default{
 	wxLoginAuthorize,
 	wxLoginQuick
 }

components/cm-module/creatOrder/address.vue

@@ -27,7 +27,7 @@
 		 		</view>
 		 	</view>
 		 </navigator>
-		 <image  src="../../../static/ws/address_cat.png" mode=""></image>
+		 <image  :src="StaticUrl+'icon-line.png'" mode=""></image>
 	</view>
 </template>
 

components/cm-module/headerNavbar/header-poduct.vue

@@ -180,7 +180,7 @@
 	.navbar-icon .iconfont {
 		 height: 100%;
 		 width: 100%;
-		 font-size: 38rpx;
+		 font-size: 30rpx;
 		 font-weight: bold;
 		 display: inline-block;
 		 overflow: hidden;

components/cm-module/orderDetails/goodsList.vue

@@ -4,6 +4,7 @@
 		<view class="goods-list">
 			<view v-for="(item, index) in shopOrderData" :key="index" class="goods-item clearfix">
 				<view class="shoptitle">
+					<view class="title-logo"><image :src="item.shopLogo" mode=""></image></view>
 					<view class="title-text">{{item.shopName}}</view> 
 				</view>
 				<view class="productlist" v-for="(pros,idx) in item.orderProductList" :key="idx">
@@ -132,6 +133,19 @@
 				height: 56rpx;
 				line-height: 56rpx;
 				margin-bottom: 12rpx;
+				.title-logo{
+					width: 48rpx;
+					height: 48rpx;
+					float: left;
+					border-radius: 8rpx;
+					border: 1px solid #e1e1e1;
+					margin-right: 8rpx;
+					image{
+						border-radius: 8rpx;
+						width: 48rpx;
+						height: 48rpx;
+					}
+				}
 				.title-text{
 					width: 400rpx;
 					overflow: hidden;

manifest.json

@@ -56,7 +56,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx2c3b0a7f343235b1",
+        "appid" : "wxf3cd4ae0cdd11c36",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,

pages.json

@@ -86,13 +86,6 @@
 					"navigationStyle": "custom"
 				}
 			},
-			{
-				"path": "order/order-payment",
-				"style": {
-					"navigationBarTitleText": "选择支付方式",
-					"navigationStyle": "custom"
-				}
-			},
 			{
 				"path": "order/order-list",
 				"style": {
@@ -101,9 +94,10 @@
 				}
 			},
 			{
-				"path": "order/order-historylist",
+				"path": "order/order-list-retail",
 				"style": {
-					"navigationBarTitleText": "机构订单列表"
+					"navigationBarTitleText": "我的订单",
+					"navigationStyle": "custom"
 				}
 			},
 			{

pages/goods/product.vue

@@ -106,7 +106,7 @@
 					<view class="content-none"  v-else>
 						<text>暂无服务项目</text>
 					</view>
-				</view>	
+				</view>				
 				<!-- 商品参数 -->
 				<tui-bottom-popup :radius="true" :show="popupShow" @close="hidePopup()">
 					<view class="tui-popup-box clearfix">
@@ -151,8 +151,12 @@
 					</view>	
 				</tui-bottom-popup>	
 				<!-- 底部按钮 -->
-				<view class="menu" v-if="isShowButton">
+				<view class="menu">
 					<view class="bottom-btn" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
+						<!-- 已下架商品提示 -->
+						<view class="product-invalid" v-if="isShowButton" :style="{bottom :isIphoneX ? '168rpx' : '100rpx'}">
+							<text>商品已经下架啦，非常抱歉！</text>
+						</view>
 						<view class="bottom-le">
 							<view class="item-bt" @click="this.$api.switchTabTo('/pages/tabBar/index/index')">
 								<text class="iconfont icon-fanhuishouye"></text>
@@ -175,14 +179,14 @@
 						</view>
 						<view class="bottom-ri">
 							<button  
-									:disabled="goodsData.disabled" 
+									:disabled="isShowButton" 
 									class="btn btn-cart" 
-									:class="[goodsData.disabled ? 'disabled':'']"
+									:class="[isShowButton ? 'disabled':'']"
 									@tap.stop="btnGetConfirm('add')">加入购物车</button>
 							<button  
-									:disabled="goodsData.disabled" 
+									:disabled="isShowButton" 
 									class="btn btn-bay" 
-									:class="[goodsData.disabled ? 'disabled':'']"
+									:class="[isShowButton ? 'disabled':'']"
 									@tap.stop="btnGetConfirm('buy')">立即购买</button>
 						</view>
 					</view>	
@@ -706,11 +710,6 @@
 				this.userID = resolve.userId ? resolve.userId : '';	
 				this.userIdentity = resolve.userIdentity ? resolve.userIdentity : 0
 				this.shopID =  resolve.shopId ? resolve.shopId : '';
-				if(this.userIdentity == 0 || this.userIdentity == 2 || this.userIdentity == 4){
-					this.isShowButton = true
-				}else{
-					this.isShowButton = false
-				}					
 				if (isPreviewImg) {
 					isPreviewImg = false;
 					return;
@@ -1176,6 +1175,18 @@
 		font-size: $font-size-32;
 		font-weight: bold;
 	}
+	.product-invalid{
+		width: 100%;
+		height: 80rpx;
+		background-color: #666666;
+		text-align: center;
+		line-height: 80rpx;
+		font-size: $font-size-26;
+		color: #FFFFFF;
+		position: fixed;
+		bottom: 180rpx;
+		left: 0;
+	}
 	.bottom-btn{
 		width: 100%;
 		height: 100rpx;
@@ -1200,7 +1211,7 @@
 				align-items: center;
 				justify-content: center;
 				font-size: $font-size-22;
-				color: $text-color;
+				color: #666666;
 				line-height: 34rpx;
 				position: relative;
 				.iconfont{

pages/tabBar/index/index.vue

@@ -302,10 +302,10 @@
 		},
 		methods: {
 			...mapMutations(['login','logout']),
-			async getWxAuthorize(){
+			async GetWxAuthorize(){
 				const wechatCode = await authorize.getCode('weixin');// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
 				const getUserInfo = await authorize.getUserInfo('weixin');
-				this.UserService.UserLoginAuthApplets({ 
+				this.UserService.userInfoLogin({ 
 					code:wechatCode,
 					encryptedData:getUserInfo.encryptedData,
 					iv:getUserInfo.iv
@@ -365,14 +365,15 @@
 			async InitAuthorize(){ //是否已授权 0:为取消授权 1:为已授权 2:为未操作
 				authorize.checkLogin()
 				.then(res => {
+					console.log(res);
 					this.GetWxAuthorize()
 				})
 				.catch(err => {
 					this.$api.getComStorage('userInfo').then((resolve) =>{
 						this.userID = resolve.userId ? resolve.userId :0;
-						this.getHomeInformation()
+						// this.getHomeInformation()
 					}).catch(error =>{
-						this.getHomeInformation()
+						// this.getHomeInformation()
 					})
 				})
 			}
@@ -405,7 +406,7 @@
 		},
 		onShow(){
 			this.modallayer = false
-			// this.InitAuthorize()
+			this.InitAuthorize()
 		}
 	}
 </script>

pages/tabBar/user/index.vue

@@ -234,11 +234,11 @@ export default {
 		navigator(url) {
 			authorize.checkLogin()
 			.then(res => {
-				// if(this.hasLogin){
+				if(this.hasLogin){
 					this.$api.navigateTo(url)
-				// }else{
-					// this.$api.navigateTo('/pages/login/login?type=0')
-				// }
+				}else{
+					this.$api.navigateTo('/pages/login/login?type=0')
+				}
 			})
 			.catch(err => {
 				this.$api.navigateTo('/pages/authorize/authorize')

pages/user/order/create-order.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container order clearfix" :style="{paddingBottom :isIphoneX ? '170rpx' : '134rpx'}">
-		<!-- 地址选择 -->
-		<choice-address ref="choiceAddress" v-if="isAddress" :addressData="addressData"></choice-address>
+		<!-- 地址选择 v-if="isAddress" -->
+		<choice-address ref="choiceAddress" :addressData="addressData"></choice-address>
 		<!-- 商品 -->
 		<goodsList ref='goods' v-if="isRequest" :goodsData="goodsData" @handleGoodList="handChangeInputGoodsList"></goodsList>
 		<!-- 运费 -->
@@ -61,8 +61,25 @@
 				isAddress:false,		  //是否加载完成地址
 				isfreightTip:false,		  //控制邮费弹窗
 				ischecked:false,	      //是否勾选余额
-				addressData:{},			  //初始化地址信息
-				goodsData:[],			  //初始化商品信息
+				addressData:{
+					address: "奥术大师大所打撒大是奥术大师大所打撒大是奥术大师大所打撒大是",
+					addressID: 2913,
+					city: "县",
+					cityID: 2,
+					defaultFlag: "1",
+					mobile: "13316418828",
+					phone: null,
+					postalCode: null,
+					province: "北京市",
+					provinceID: 1,
+					shouHuoRen: "郑大大",
+					town: "东城区282",
+					townID: 17,
+					userID: 11063
+				},//初始化地址信息
+				goodsData:[
+					
+				],//初始化商品信息
 				invoiceData:{type:0},	  //初始化发票信息
 				freightData:{},			  //邮费数据
 				orderInfo:[],			  //提交的商品信息
@@ -73,6 +90,7 @@
 			}
 		},
 		onLoad(option){//商品数据
+			this.getInitCrearOrder();
 			let data = JSON.parse(option.data);
 			this.allPrice = data.data.allPrice;
 			this.allCount = data.data.allCount;
@@ -80,7 +98,6 @@
 			this.userId = data.data.userId
 			this.productIds = data.data.productID
 			console.log(this.allCount)
-			this.getInitCrearOrder();
 		},
 		filters:{
 			NumFormat(value) {//处理金额
@@ -89,7 +106,12 @@
 		},
 		methods: {
 			getInitCrearOrder(option){//确认订单初始化信息 
-				let params ={userId:this.userId,productIds:this.productIds}
+				let params ={
+						userId:11104,
+						count:1,
+						productIds:1010,
+						unionId:'ox_1SwWzHhZwQg1va3Sr-InZoccc'
+					}
 				this.OrderService.QueryOrderConfirm(params)
 					.then(response =>{
 						let data = response.data
@@ -104,25 +126,8 @@
 						this.$util.msg(error.msg,2000)
 					})
 			},
-			getFreightData(){//获取邮费信息
-				let params ={
-						userId:this.userId,
-						productIds:this.productIds,
-						totalPrice:this.allPrice,
-						townId:this.addressData.townId
-					}
-				this.OrderService.GetOrderPostage(params).then(response =>{
-					this.isFreight = true
-					this.freightData = response.data
-					if(response.data.freePostFlag== 1){
-						this.payAllPrice = this.allPrice+response.data.freight
-					}else{
-						this.payAllPrice = this.allPrice
-					}
-				})
-			},
 			getAddressData(){//获取地址信息
-				this.UserService.QueryAddressList({pageNum:1,pageSize:1,userId:this.userId})
+				this.UserService.QueryAddressList({pageNum:1,pageSize:1,userId:11104})
 				.then(response =>{
 					this.isAddress = true
 					this.addressData = {}
@@ -130,7 +135,6 @@
 						this.addressId = response.data.list[0].addressId;
 						this.townId = response.data.list[0].townId;
 						this.addressData = response.data.list[0];
-						// this.getFreightData()
 					}else{
 						this.addressData = this.addressData;
 					}
@@ -230,7 +234,6 @@
 				let SelectData = uni.getStorageSync('selectAddress');
 				this.addressId = SelectData.addressId;
 				this.addressData = SelectData
-				this.getFreightData()
 			}else{
 				this.getAddressData()
 			}

pages/user/order/order-historylist.vue → pages/user/order/order-list-retail.vue

@@ -1,12 +1,25 @@
 <template>
-	<view class="container" :style="{paddingTop:50+'px'}">
-		<view class="order-section-top">
+	<view class="container" :style="{paddingTop:(navbarHeight+82)+'px'}">
+		<!-- 自定义返回 -->
+		<header-back :systeminfo='systeminfo' 
+					 :navbar-data='nvabarData' 
+					 :headerBtnPosi ="headerBtnPosi" 
+					 :isDelete="isDelete" 
+					 :isUsertype="1"
+					 @goSearchPath="handlSearchPath">
+		</header-back>
+		<view class="order-section-top" :style="{marginTop:navbarHeight+'px'}">
 			<scroll-view scroll-x scroll-with-animation class="tab-view" :scroll-left="scrollLeft">
 				<view v-for="(item,index) in orderTabBar" :key="index" class="tab-bar-item" :class="[currentTab==index ? 'active' : '']"
 				 :data-current="index" @tap.stop="onClickTab">
 					<text class="tab-bar-title">{{item.text}}</text>
+					<text class="line"></text>
 				</view>
 			</scroll-view>
+			<view class="tab-screen">
+				<view v-for="(item,index) in screenTabBar" :key="index" class="tab-screen-item" :class="[screenTab == index ? 'active' : '']"
+				 :data-current="index" @tap.stop="onClickScreenTab(index)">{{item.text}}</view>
+			</view>
 		</view>
 		<swiper class="tab-content" :current="currentTab" duration="80" @animationfinish="onChange" :style="{height:winHeight+'px'}" >
 			<swiper-item v-for="(tabItem,index) in orderTabBar" :key="index">
@@ -17,62 +30,48 @@
 						<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0" :typeIndex="currentTab" :navbarHeight="navbarHeight"></empty>
 						<!-- 列表 -->
 						<view v-else class="tui-order-content">
-							<view  class="tui-order-item" v-for="(order,orderIndex) in tabItem.orderList" :key="orderIndex" @click.stop="detail(order.orderId)">
+							<view  class="tui-order-item" v-for="(order,orderIndex) in tabItem.orderList" :key="orderIndex" >
 								<view class="order-title">
-									<view class="order-title-name">{{order.clubName}}</view>
 									<view class="order-title-t">
-										<text class="bage-text tui-skeleton-fillet">订单编号：{{order.orderNo}}({{order.orderId}})</text>
-										<image class="bage-icon" src="https://static.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
+										<text class="bage-text tui-skeleton-fillet"><text class="text">订单编号：</text>{{order.orderNo}}</text>
 									</view>
 									<view class="order-title-b">
-										<view class="order-title-btxt tui-skeleton-fillet">下单时间：{{order.orderTime}}</view>
-										<view class="order-title-tip tui-skeleton-fillet">{{StateExpFormat(order.status)}}</view>
+										<view class="order-title-btxt tui-skeleton-fillet"><text class="text">下单时间：</text>{{order.orderTime}}</view>
+										<view class="order-title-tip tui-skeleton-fillet">{{ StateExpFormat(order.status) }}</view>
 									</view>
 								</view>
-								<block v-for="(shop,index) in order.shopOrderList" :key="index">
+								<block v-for="(shop,sindex) in order.shopOrderList" :key="sindex">
 									<view class="goods-title">
 										<view class="title-logo"><image :src="shop.shopLogo" mode=""></image></view>
 										<view class="title-text tui-skeleton-fillet">{{shop.shopName}}</view>
 									</view>
-									<view class="goods-item" v-for="(pros,prosIndex) in shop.orderProductList" :key="prosIndex">
+									<view class="goods-item" v-for="(pros,prosIndex) in shop.orderProductList" :key="prosIndex" @click.stop="detail(order.orderId)">
 										<view class="goods-pros-t">
 											<view class="pros-img tui-skeleton-fillet">
 												<image :src="pros.productImage" alt="" />
-												<text class="tips" v-if="pros.productType ==2 || pros.productType ==1">赠品</text>
 											</view>
 											<view class="pros-product clearfix">
 												<view class="producttitle tui-skeleton-fillet">{{pros.name}}</view>
-												<view class="productspec tui-skeleton-fillet" v-if="pros.productCategory != 2">规格:{{pros.productUnit ? pros.productUnit : ''}}</view>
+												<view class="productspec tui-skeleton-fillet" v-if="pros.productCategory!=2">规格:{{pros.productUnit}}</view>
+												<view class="floor-item-act"><view class="tag" @click.stop="clickPopupShow(pros,2)">活动价</view></view>
 												<view class="productprice">
-													<view class="price " v-if="pros.productType ==2 || pros.productType ==1">
-														<text>￥0.00</text>
-													</view>
-													<view class="price tui-skeleton-fillet" :class="PromotionsFormat(pros.productPromotion) ? 'disabled' : ''">
-														<text>￥{{ pros.price | NumFormat }}</text>
-													</view>
-													<view class="count tui-skeleton-fillet">
-														<text class="small">x</text>{{pros.num}}
-													</view>
-												</view>
-												<view class="floor-item-act" v-if="pros.productPromotion!=null">
-													<view v-if="PromotionsFormat(pros.productPromotion)"  class="floor-tags">
-														{{pros.productPromotion.name}}
-														<text v-if ="pros.productPromotion!=null && pros.productPromotion.type !=3 ">
-															:￥{{ pros.productPromotion == null ? '0.00' : pros.productPromotion.touchPrice | NumFormat}}
-														</text>
-													</view>
-													<view v-else-if="pros.productPromotion.type !=3" class="floor-tags">{{pros.productPromotion.name}}</view>	
+													<view class="price tui-skeleton-fillet"><text>￥{{pros.price | NumFormat}}</text></view>
+													<view class="count tui-skeleton-fillet"><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">经理折扣：¥{{ order.discountFee | NumFormat }}</view>
 									<view class="order-footer-bot">
 										<view class="count tui-skeleton-fillet">共{{order.productCount}}件商品</view>
-										<view class="money tui-skeleton-fillet" v-if="order.status==31||order.status==32||order.status==33">已支付：<label style="color:#f94b4b ;">¥{{ order.receiptAmount | NumFormat }}</label></view>
-										<view class="money tui-skeleton-fillet" v-else>待付总额：<label style="color:#f94b4b ;">¥{{ order.pendingPayments | NumFormat }}</label></view>
+										<view class="money tui-skeleton-fillet" v-if="order.status==31||order.status==32||order.status==33">
+											已支付：<text class="color">¥{{ order.receiptAmount | NumFormat }}</text>
+										</view>
+										<view class="money tui-skeleton-fillet" v-else>
+											待付总额：<text class="color">¥{{ order.pendingPayments | NumFormat }}</text>
+										</view>
 									</view>
 								</view>
 								<!-- 底部button -->
@@ -92,21 +91,43 @@
 			</swiper-item>
 		</swiper>
 		<!-- 操作弹窗 -->
-		<tui-modal :show="modal" @click="handleClick" @cancel="hideMobel" :content="contentModalText" color="#333" :size="32" shape="circle" :maskClosable="false"></tui-modal>
+		<tui-modal :show="modal" @click="handleClick" @cancel="hideMobel(1)" :content="contentModalText" color="#333" :size="32" shape="circle" :maskClosable="false"></tui-modal>
+		<!-- 再次购买订单商品全部下架弹窗 -->
+		<tui-modal :show="modal2" @click="handleClick2" @cancel="hideMobel(2)" shape="circle" content="订单内商品已全部下架，不能购买！" :button="button"></tui-modal>
+		<!-- 再次购买部分商品失效弹窗 -->
+		<tui-modal :show="modal3" @cancel="hideMobel(3)" :custom="true">
+			<view class="tui-modal-custom">
+				<view class="tui-modal-custom-text">
+					<view class="title">以下商品已失效，不能进行购买；是否先将其他商品加入购物车？</view>
+					<scroll-view scroll-y class="tui-modal-custom-list">
+						<view class="custom-list" v-for="(invalid,index) in invalidList" :key="index">
+							<view class="custom-list-image"><image :src="invalid.image" mode=""></image></view>
+							<view class="custom-list-name">{{ invalid.name }}</view>
+						</view>
+					</scroll-view>
+				</view>
+				<view class="tui-modal-button">
+					<button  class="modal-button cancel" @click="hideMobel(3)">我再想想</button>
+					<button  class="modal-button confirm" @click="handleClick3">加入购物车</button>
+				</view>
+			</view>
+		</tui-modal>
 		<!-- 透明模态层 -->
 		<modal-layer v-if='isModalLayer'></modal-layer>
 	</view>
 </template>
 
 <script>
-	import headerBack from '@/components/cm-module/headerNavbar/header-back' 		//自定义顶部导航
-	import btSearch from '@/components/uni-search/bt-search.vue'				//搜索
+	import headerBack from '@/components/cm-module/headerNavbar/header-back' 		 	 //自定义导航
+	import btSearch from '@/components/uni-search/bt-search.vue'						//搜索
 	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
 	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 orderButton from '@/components/cm-module/orderDetails/orderListButton'		 //按钮
 	import modalLayer from "@/components/modal-layer"
 	import empty from "@/components/empty";
+	import { orderDataList } from '@/common/json/data.json.js' //本地数据
+	
 	
 	export default {
 		components: {
@@ -121,63 +142,110 @@
 		},
 		data() {
 			return {
-				orderTabBar: [{state: 0,text: '全部订单',orderList: []},
+				CustomBar:this.CustomBar,// 顶部导航栏高度
+				orderTabBar: [{state: 0,text: '全部',orderList: []},
 							  {state: 1,text: '待付款',orderList: []},
 							  {state: 2,text: '待发货',orderList: []},
 							  {state: 3,text: '已发货',orderList: []},
-							  {state: 4,text: '退货/款',orderList: []},
+							  {state: 4,text: '退货/款',orderList: []}
 							 ],
+				screenTabBar:[
+								{type:0,text:'全部订单'},
+								{type:1,text:'用户订单'},
+								{type:2,text:'自身订单'}
+							],			 			 
+				headerBtnPosi:	this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
+				systeminfo:  this.setSysteminfo(),		 //获取设备信息
+				nvabarData: {							 //顶部自定义导航
+					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
+					showSearch: 1,
+					title: '我的订单', // 导航栏 中间的标题
+				},
 				winHeight: "", //窗口高度
-				userId:'',		//机构ID
-				organizeId:0,
 				currentTab: 0, //预设当前项的值
 				screenTab:0,   //筛选预设当前项的值
 				scrollLeft: 0 ,//tab标题的滚动条位置
-				serviceProviderId:0,//协销用户ID
+				userId:0,
 				orderData: [],
-				btnClubUserID:0,
 				btnoRderID: 0, //点击按钮传入的的订单ID
 				pageNum: 1,	  //页数
 				pageSize: 10,  //条数
 				scrollTop: 0,
-				deteleType:'',
 				skeletonShow: true,
+				isDelete:false,
 				isClickChange: false,
-				isSeller:false,
 				isModalLayer: false,
+				isPayModel:false,
 				loadding: false,
 				pullUpOn: true,
 				hasNextPage: false,
 				pullFlag: true,
 				navbarHeight:'',
+				payModelData:{},
+				hanldOrderData:{},
+				modelType:0,
 				nomoreText: '上拉显示更多',
+				isOnloadFlag:false,
 				modal:false,
+				modal2:false,
+				modal3:false,
 				OperationType:'',
-				contentModalText:''
+				contentModalText:'',
+				button: [
+					{
+						text: '确定',
+						type:'danger'
+					}
+				],
+				invalidList:[
+					{
+						image:'https://img.caimei365.com/group1/M00/00/0A/rB-lGGBrzcmAbarfAG8gcPdEFtI777.jpg',
+						name:'韩国恩盛进口氢洁气小气泡清韩国恩盛进口氢洁气小气泡清',
+					},
+					{
+						image:'https://img.caimei365.com/group1/M00/00/0A/rB-lGGBrzcmAbarfAG8gcPdEFtI777.jpg',
+						name:'韩国恩盛进口氢洁气小气泡清韩国恩盛进口氢洁气小气泡清',
+					},
+					{
+						image:'https://img.caimei365.com/group1/M00/00/0A/rB-lGGBrzcmAbarfAG8gcPdEFtI777.jpg',
+						name:'韩国恩盛进口氢洁气小气泡清韩国恩盛进口氢洁气小气泡清',
+					},
+					{
+						image:'https://img.caimei365.com/group1/M00/00/0A/rB-lGGBrzcmAbarfAG8gcPdEFtI777.jpg',
+						name:'韩国恩盛进口氢洁气小气泡清韩国恩盛进口氢洁气小气泡清',
+					},
+					{
+						image:'https://img.caimei365.com/group1/M00/00/0A/rB-lGGBrzcmAbarfAG8gcPdEFtI777.jpg',
+						name:'韩国恩盛进口氢洁气小气泡清韩国恩盛进口氢洁气小气泡清',
+					},
+				]
 			}
 		},
-		onLoad(option) {
-			let self = this
-			this.$api.getStorage().then((resolve) =>{
-				this.organizeId = resolve.organizeId
-			})
+		onLoad(e) {
+			let self = this;
+			if(e.type ==='detele'){self.isDelete = true}
+			self.currentTab = e.state
+			self.isOnloadFlag = true
+			self.getHeaderTopHeight()//设置自定义导航高度
 			//  高度自适应
 			uni.getSystemInfo({
 				success: function(res) {
 					let calc = res.windowHeight;
-					self.winHeight = calc-82;
+					self.winHeight = calc - self.CustomBar;
 				}
 			});
-			
 		},
 		filters:{
 			NumFormat(value) {//处理金额
 				return Number(value).toFixed(2);
 			},
-		},
+		},	
 		methods: {
+			goShophome(id){
+				this.$api.navigateTo(`/supplier/pages/user/my-shop?shopId=${id}`)
+			},
 			// 滚动切换标签样式
-			onChange (e) {
+			onChange: function(e) {
 				let index = e.target.current || e.detail.current;
 				if (this.isClickChange) {
 					this.currentTab = index;
@@ -191,10 +259,12 @@
 				this.pullUpOn = true //切换时隐藏
 				this.loadding =  false //切换时隐藏
 				this.nomoreText = ''
-				this.GetOrderDatainit(this.currentTab,'tabChange')
+				if(!this.isOnloadFlag){
+					this.GetOrderDatainit(this.currentTab,'tabChange')
+				}
 			},
 			// 点击标题切换当前页时改变样式
-			onClickTab (e) {
+			onClickTab: function(e) {
 				let tabIndex = e.target.dataset.current || e.currentTarget.dataset.current;
 				if (this.currentTab === tabIndex) {
 					return false;
@@ -208,7 +278,6 @@
 				}
 			},
 			onClickScreenTab(index){
-				console.log(index)
 				this.screenTab = index
 				this.pageNum = 1
 				this.pullUpOn = true //切换时隐藏
@@ -226,27 +295,47 @@
 				}
 			},
 			GetOrderDatainit(index,source){
-				console.log(index)
-				setTimeout(()=>{this.skeletonShow = false},1500)
-				let orderItem = this.orderTabBar[index];
-				let state = orderItem.state;
-				if(source === 'tabChange' && orderItem.loaded === true){//tab切换只有第一次需要加载数据
-					return;
-				}
+				/**
+				 * @订单初始化加载  仅加载第一页码
+				 * @param：orderState(订单状态:0全部,1待付款,2待发货,3已发货,4退货款)
+				 * @param：userId(用户ID)
+				 * @param：pageNum(页码数)
+				 * @param：pageSize(每页条数)
+				 * @param：organizeID(全局变量组织ID)
+				 */ 
+				setTimeout(()=>{
+					this.skeletonShow = false
+					this.isOnloadFlag = false
+				},1500)
+				let orderItem = this.orderTabBar[0];
+				// let state = orderItem.state;
+				// if(source === 'tabChange' && orderItem.loaded === true){
+				// 	//tab切换只有第一次需要加载数据
+				// 	return;
+				// }
 				setTimeout(()=>{
-					this.$api.getComStorage('clubInfo').then((resolve) =>{
-						let params = {orderState:index,userId:resolve.userId,organizeId:this.organizeId,pageNum:1,pageSize:this.pageSize};
-						this.OrderService.QueryOrderList(params).then(response =>{
-							let orderList = response.data.list.filter(item=>{
-								//添加不同状态下订单的表现形式
-								item = Object.assign(item, this.StateExpFormat(item.state));
-								return item;
+					// this.$api.getStorage().then((resolve) =>{
+					// 	this.userId = resolve.userId
+					// 	this.organizeId = resolve.organizeId
+					// 	this.OrderService.QueryOrderList(
+					// 		{
+					// 			orderState:index,
+					// 			organizeId:resolve.organizeId,
+					// 			pageNum:1,
+					// 			pageSize:this.pageSize,
+					// 			}
+					// 	)
+					// 	.then(response =>{
+							//loaded新字段用于表示数据加载完毕，如果为空可以显示空白页
+							let orderList = orderDataList.filter(item=>{
+									//添加不同状态下订单的表现形式
+									item = Object.assign(item, this.StateExpFormat(item.state));
+									return item;
 							});
 							orderItem.orderList =[];
 							orderList.forEach(item=>{
 								orderItem.orderList.push(item);
 							})
-							//loaded新字段用于表示数据加载完毕，如果为空可以显示空白页
 							this.$set(orderItem, 'loaded', true);
 							this.hasNextPage = response.data.hasNextPage;
 							if(this.hasNextPage){
@@ -260,35 +349,40 @@
 									this.nomoreText = '已至底部'
 								}
 							}
-						}).catch(error =>{
-							this.$util.msg(error.msg,2000);
-						})
-					})
+					// 	}).catch(error =>{
+					// 		this.$util.msg(error.msg,2000);
+					// 	})
+					// })
 				}, 600);	
 			}, 
 			getOnReachBottomData(index){//上拉加载
-				this.pageNum += 1
-				this.$api.getComStorage('clubInfo').then((resolve) =>{
-					let params = {orderState:index,userId:resolve.userId,organizeId:this.organizeId,pageNum:this.pageNum,pageSize:this.pageSize};
-					this.OrderService.QueryOrderList(params).then(response =>{
-						let orderItem = this.orderTabBar[index];
-						let resData = response.data.list
-						this.hasNextPage = response.data.hasNextPage;
-						orderItem.orderList = orderItem.orderList.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 = '已至底部'
-						}
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})	
+				this.pageNum+=1
+				this.OrderService.QueryOrderList(
+					{
+						orderState:index,
+						organizeId:this.organizeId,
+						pageNum:this.pageNum,
+						pageSize:this.pageSize
+					}
+				)
+				.then(response =>{
+					let orderItem = this.orderTabBar[index];
+					let resData = response.data.results
+					this.hasNextPage = response.data.hasNextPage;
+					orderItem.orderList = orderItem.orderList.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 = '已至底部'
+					}
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
 			},
 			scrolltolower() {
 				if(this.hasNextPage){
@@ -326,6 +420,14 @@
 						this.isModalLayer = true;
 						this.$api.navigateTo('/pages/user/order/order-logistics?orderId='+data.orderId)
 						break;
+					case 'again':
+						const isAgainType = 2
+						if(isAgainType == 1){
+							this.modal2 = true
+						}else{
+							this.modal3 = true
+						}
+						break;
 					case 'pay':
 						if(data.order.onlinePayFlag == '0'){
 							this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderId=${data.orderId}`)
@@ -352,6 +454,9 @@
 				}
 				this.modal = false;
 			},
+			handleClick2(){
+				this.modal2 = false;
+			},
 			handOrderConfirm (id){//确认收货
 				this.OrderService.ConfirmReceipt({orderId:id}).then(response =>{
 					this.$util.msg(response.msg,2000,true,'success');
@@ -385,6 +490,40 @@
 			handlSearchPath(){
 				this.$api.navigateTo('/pages/user/order/search-order')
 			},
+			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
+			},
 			PromotionsFormat(promo){//促销活动类型数据处理
 				if(promo!=null){
 					if(promo.type == 1 && promo.mode == 1){
@@ -395,9 +534,8 @@
 				}
 				return false
 			},
-			//订单状态文字和颜色
-			StateExpFormat (state){
-				let stateText = '',
+			StateExpFormat(state){ //订单状态文字和颜色
+				var HtmlStateText = '',
 					stateTextObject={
 						4:'交易完成',
 						5:'订单完成',
@@ -413,19 +551,22 @@
 						31:'已付款待发货',
 						32:'已付款部分发货',
 						33:'已付款已发货',
-						111:'待付款待发货',
-					}
-				Object.keys(stateTextObject).forEach(key => {
+						111:'待付款待发货'
+					};
+				Object.keys(stateTextObject).forEach(function(key){
 					if(key == state){
-						stateText = stateTextObject[key]
+						HtmlStateText = stateTextObject[key]
 					}
-				})
-				return stateText;
+				});
+				return HtmlStateText;
 			},
-			orderPriceToFixed (n){
-				let price ='';
-				price = n.toFixed(2);
-				return price
+			hideMobel(index) {
+				switch(index){
+					case 1:this.modal = false;break;
+					case 2:this.modal2 = false;break;
+					case 3:this.modal3 = false;break;
+				}
+				
 			},
 		},
 		onPageScroll(e) {
@@ -434,14 +575,14 @@
 		onShow() {
 			this.isModalLayer = false;
 			this.GetOrderDatainit(this.currentTab)
+			// console.log(this.orderTabBar)
 		}
 	}
 </script>
 
 <style lang="scss">
-	/*tabbar end*/
 	page{
-		background: #FFFFFF;
+		background-color: #FFFFFF;
 	}
 	/*tabbar start*/
 	::-webkit-scrollbar {
@@ -457,26 +598,23 @@
 		z-index: 99;
 		background: #FFFFFF;
 		.tab-screen{
-			height: 60rpx;
+			height: 48rpx;
 			width: 702rpx;
-			padding: 10rpx 24rpx;
-			border-top: 1px solid #F7F7F7;
-			border-bottom: 1px solid #F7F7F7;
-			display: flex;
-			justify-content: center;
-			justify-items: center;
+			padding: 20rpx 24rpx 30rpx 24rpx;
 			.tab-screen-item{
-				flex: 1;
-				height: 60rpx;
-				border-radius: 10rpx;
+				height: 48rpx;
+				border-radius: 24rpx;
 				background: #F7F7F7;
-				margin-right: 22rpx;
-				line-height: 66rpx;
-				font-size: $font-size-28;
+				margin-right: 48rpx;
+				line-height: 48rpx;
+				font-size: $font-size-26;
 				color: #333333;
 				text-align: center;
+				padding: 0 24rpx;
+				float: left;
 				&.active{
 					color: $color-system;
+					background-color: #fff3f7;
 				}
 				&:last-child{
 					margin-right: 0;
@@ -487,6 +625,7 @@
 	.tab-view::before {
 		content: '';
 		position: absolute;
+		border-bottom: 1rpx solid #eaeef1;
 		-webkit-transform: scaleY(0.5);
 		transform: scaleY(0.5);
 		bottom: 0;
@@ -510,21 +649,33 @@
 		display: inline-block;
 		text-align: center;
 		box-sizing: border-box;
-		&.active {
-			border-bottom: 6rpx solid #c4761f;
-		}
+		position: relative;
 		.tab-bar-title {
 			height: 80rpx;
 			line-height: 80rpx;
 			font-size:$font-size-28;
 			color: $text-color;
 		}
-		&.active .tab-bar-title {
-			color: #c4761f !important;
+		.line{
+			width: 40rpx;
+			height: 4rpx;
+			border-radius: 2rpx;
+			position: absolute;
+			bottom: 8rpx;
+			left: 50%;
+			margin-left: -20rpx;
+			background-color: #FFFFFF;
+		}
+		&.active {
+			.line{
+				background-color: $color-system;
+			}
+			.tab-bar-title {
+				color: $color-system !important;
+			}
 		}
 	}
 	.container {
-		background-color: #F7F7F7;
 		padding-bottom: env(safe-area-inset-bottom);
 		height: auto;
 		position: relative;
@@ -541,27 +692,20 @@
 		display: flex;
 		flex-direction: column;
 		width: 702rpx;
-		padding:0 24rpx;
+		padding:20rpx 24rpx 0 24rpx;
 		background: #fff;
 		border-bottom: 20rpx solid #F7F7F7;
 	}
 	.order-title{
 		width: 100%;
 		height: auto;
-		.order-title-name{
-			width: 100%;
-			height: 72rpx;
-			border-bottom: 1px solid #F7F7F7;
-			line-height: 72rpx;
-			text-align: left;
-			font-size: $font-size-28;
-			color: #333333;
-		}
+		padding-bottom: 20rpx;
+		border-bottom: 1px solid #e1e1e1;
 		.order-title-t{
 			width: 100%;
-			height: 68rpx;
+			height: 48rpx;
 			float: left;
-			line-height: 68rpx;
+			line-height: 48rpx;
 			position: relative;
 			.bage-icon{
 				width: 50rpx;
@@ -571,55 +715,36 @@
 				right: 0;
 				top: 9rpx;
 			}
-			.bage-buss{
-				display: inline-block;
-				width: 72rpx;
-				height: 30rpx;
-				background:radial-gradient(circle,rgba(255,39,180,1) 0%,rgba(193,77,245,1) 100%);
-				border-radius: 4rpx;
-				line-height: 30rpx;
-				font-size: $font-size-22;
-				text-align: center;
-				color: #FFFFFF;
-				margin-top: 8rpx;
-			}
-			.bage-auto{
-				display: inline-block;
-				width: 72rpx;
-				height: 30rpx;
-				background:radial-gradient(circle,rgba(255,180,39,1) 0%,rgba(245,142,77,1) 100%);
-				border-radius: 4rpx;
-				line-height: 30rpx;
-				font-size: $font-size-22;
-				text-align: center;
-				color: #FFFFFF;
-				margin-top: 8rpx;
-			}
 			.bage-text{
 				display: inline-block;
 				font-size: $font-size-28;
-				line-height: 68rpx;
+				line-height: 48rpx;
 				text-align: left;
-				color: $color-system;
-				margin-left: 15rpx;
+				color: $text-color;
+				.text{
+					color: #999999;
+				}
 			}
 		}
 		.order-title-b{
 			width: 100%;
-			height: 40rpx;
+			height: 48rpx;
 			float: left;
 			margin-top: 8rpx;
 			.order-title-btxt{
 				float: left;
 				font-size: $font-size-28;
-				line-height: 40rpx;
-				color: #999999;
-				text-align: lef
+				line-height: 48rpx;
+				color: $text-color;
+				text-align: left;
+				.text{
+					color: #999999;
+				}
 			}
 			.order-title-tip{
 				float: right;
 				font-size: $font-size-28;
-				line-height: 40rpx;
+				line-height: 48rpx;
 				text-align: right;
 				color: #FF2A2A;
 			}
@@ -634,13 +759,13 @@
 			width: 56rpx;
 			height: 56rpx;
 			float: left;
-			box-sizing: border-box;
-			margin-right: 10rpx;
+			border-radius: 8rpx;
 			border: 1px solid #e1e1e1;
+			margin-right: 8rpx;
 			image{
+				border-radius: 8rpx;
 				width: 56rpx;
 				height: 56rpx;
-				display: block;
 			}
 		}
 		.title-text{
@@ -671,20 +796,6 @@
 			border-radius: 10rpx;
 			margin:0 26rpx 0 0;
 			position: relative;
-			.tips{
-				display: inline-block;
-				width: 80rpx;
-				height: 40rpx;
-				background-image: linear-gradient(214deg, #ff4500 0%, #ff5800 53%, #ff4367 100%);
-				line-height: 40rpx;
-				text-align: center;
-				font-size: $font-size-24;
-				color: #FFFFFF;
-				border-radius:10rpx 0 10rpx 0 ;
-				position: absolute;
-				top:0;
-				left: 0;
-			}
 			image{
 				width: 210rpx;
 				height: 210rpx;
@@ -715,17 +826,18 @@
 		.productspec{
 			height: 36rpx;
 			color: #999999;
-			margin: 10rpx 0;
+			margin: 10rpx 0 0 0;
 		}
 		.productprice{
 			height: 48rpx;
 			width: 100%;
 			float: left;
+			margin-top: 10rpx;
 			.price{
 				line-height: 48rpx;
 				font-size: $font-size-28;
 				width: 48%;
-				color: #FF2A2A;
+				color: $color-system;
 				float: left;
 				font-weight: bold;
 				&.disabled{
@@ -744,22 +856,19 @@
 		}
 		.floor-item-act{
 			width: 100%;
-			height: 56rpx;
-			text-align: center;
-			box-sizing: border-box;
+			height: 30rpx;
+			margin-top: 8rpx;
 			float: left;
-			padding:0 0 10rpx 0;
-			.floor-tags{
-				height: 28rpx;
-				border-radius: 6rpx;
-				background-color: #FFFFFF;
-				line-height: 28rpx;
-				color: #ff2a2a;
-				text-align: center;
+			.tag{
 				display: inline-block;
-				padding:0 5rpx;
-				font-size: $font-size-20;
-				border: 1px solid #ff2a2a;
+				width: 80rpx;
+				height: 30rpx;
+				background: url(https://static.caimei365.com/app/mini-hehe/icon/icon-active.png)top center no-repeat;
+				background-size: contain;
+				font-size: 22rpx;
+				line-height: 30rpx;
+				text-align: center;
+				color: #f83c6c;
 				float: left;
 			}
 		}
@@ -768,31 +877,102 @@
 		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;
-		}
+		margin-top: 20rpx;
 		.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;
+				font-weight: bold;
 			}
 			.money{
 				width: 50%;
 				float: right;
 				text-align: right;
+				.color{
+					color: $color-system;
+					font-weight: bold;
+				}
+			}
+		}
+	}
+	.tui-modal-custom-text{
+		min-height: 300rpx;
+		margin-bottom: 30rpx;
+		.title{
+			width: 100%;
+			height: auto;
+			font-size: $font-size-30;
+			text-align: justify;
+			color: #333333;
+			line-height: 40rpx;
+			margin-bottom: 30rpx;
+		}
+		.tui-modal-custom-list{
+			width: 100%;
+			height: 350rpx;
+			overflow: hidden;
+			.custom-list{
+				width: 100%;
+				height: 117rpx;
+				box-sizing: border-box;
+				float: left;
+				padding: 15rpx 0;
+				.custom-list-image{
+					width: 86rpx;
+					height: 86rpx;
+					float: left;
+					border-radius: 6rpx;
+					box-sizing: border-box;
+					border: 1px solid #e1e1e1;
+					image{
+						width: 84rpx;
+						height: 84rpx;
+						border-radius: 6rpx;
+						display: block;
+					}
+				}
+				.custom-list-name{
+					width: 400rpx;
+					height: 86rpx;
+					float: right;
+					line-height: 43rpx;
+					font-size: $font-size-26;
+					color: #666666;
+					text-overflow: ellipsis;
+					overflow: hidden;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					line-clamp: 2;
+					-webkit-box-orient: vertical;
+				}
+			}
+		}
+	}
+	.tui-modal-button{
+		width: 100%;
+		height: 72rpx;
+		display: flex;
+		.modal-button{
+			width: 200rpx;
+			height: 72rpx;
+			line-height: 72rpx;
+			border-radius: 36rpx;
+			box-sizing: border-box;
+			&.cancel{
+				border: 1px solid #b2b2b2;
+				background: #FFFFFF;
+				color: #333333;
+			}
+			&.confirm{
+				background: $btn-confirm;
+				color: #FFFFFF;
 			}
 		}
 	}

pages/user/order/order-list.vue

@@ -7,6 +7,7 @@
 				<view v-for="(item,index) in orderTabBar" :key="index" class="tab-bar-item" :class="[currentTab==index ? 'active' : '']"
 				 :data-current="index" @tap.stop="onClickTab">
 					<text class="tab-bar-title">{{item.text}}</text>
+					<text class="line"></text>
 				</view>
 			</scroll-view>
 		</view>
@@ -282,12 +283,12 @@
 					this.skeletonShow = false
 					this.isOnloadFlag = false
 				},1500)
-				let orderItem = this.orderTabBar[index];
-				let state = orderItem.state;
-				if(source === 'tabChange' && orderItem.loaded === true){
-					//tab切换只有第一次需要加载数据
-					return;
-				}
+				let orderItem = this.orderTabBar[0];
+				// let state = orderItem.state;
+				// if(source === 'tabChange' && orderItem.loaded === true){
+				// 	//tab切换只有第一次需要加载数据
+				// 	return;
+				// }
 				setTimeout(()=>{
 					// this.$api.getStorage().then((resolve) =>{
 					// 	this.userId = resolve.userId
@@ -598,20 +599,32 @@
 		display: inline-block;
 		text-align: center;
 		box-sizing: border-box;
+		position: relative;
+		.tab-bar-title {
+			height: 80rpx;
+			line-height: 80rpx;
+			font-size:$font-size-28;
+			color: $text-color;
+		}
+		.line{
+			width: 40rpx;
+			height: 4rpx;
+			border-radius: 2rpx;
+			position: absolute;
+			bottom: 8rpx;
+			left: 50%;
+			margin-left: -20rpx;
+			background-color: #FFFFFF;
+		}
+		&.active {
+			.line{
+				background-color: $color-system;
+			}
+			.tab-bar-title {
+				color:$color-system !important;
+			}
+		}
 	}
-	.tab-bar-title {
-		height: 80rpx;
-		line-height: 80rpx;
-		font-size:$font-size-28;
-		color: $text-color;
-	}
-	.active {
-		border-bottom: 6rpx solid $color-system;
-	}
-	.active .tab-bar-title {
-		color:$color-system !important;
-	}
-
 	/*tabbar end*/
 	.scoll-y {
 		height: 100%;
@@ -704,13 +717,13 @@
 			width: 56rpx;
 			height: 56rpx;
 			float: left;
-			box-sizing: border-box;
-			margin-right: 10rpx;
+			border-radius: 8rpx;
 			border: 1px solid #e1e1e1;
+			margin-right: 8rpx;
 			image{
+				border-radius: 8rpx;
 				width: 56rpx;
 				height: 56rpx;
-				display: block;
 			}
 		}
 		.title-text{

pages/user/order/order-logistics.vue

@@ -13,8 +13,12 @@
 							<view class="pros-img"><image :src="pros.mainImage" alt="" /></view>
 							<view class="pros-product">
 								<view class="producttitle">{{pros.name}}</view>
-								<view class="productspec">购买数量：{{pros.number}}</view>
-								<view class="productspec">已发货数量：{{pros.logNumber}}</view>
+								<view class="productspec">
+									购买数量：<text class="color">{{pros.number}}</text>
+								</view>
+								<view class="productspec">
+									已发货数量：<text class="color">{{pros.logNumber}}</text>
+								</view>
 							</view>	
 						</view>
 					</view>
@@ -95,7 +99,7 @@
 				})
 			},
 			getData() {
-				this.OrderService.QueryLogistics({orderId: this.orderId}).then(response =>{
+				this.OrderService.QueryLogistics({orderID: this.orderId}).then(response =>{
 					const resData = response.data;
 					// 添加订单列表信息
 					let orderListArr = [];
@@ -186,7 +190,7 @@
 			height: auto;
 			float: left;
 			background: #FFFFFF;
-			margin-bottom: 24rpx;	
+			margin-bottom: 20rpx;	
 			.goods-title{
 				width: 100%;
 				height: 48rpx;
@@ -196,8 +200,10 @@
 					width: 48rpx;
 					height: 48rpx;
 					float: left;
-					border: 1px solid #E1E1E1;
+					border-radius: 8rpx;
+					border: 1px solid #e1e1e1;
 					image{
+						border-radius: 8rpx;
 						width: 48rpx;
 						height: 48rpx;
 					}
@@ -215,16 +221,20 @@
 			.goods-item{
 				width: 100%;
 				height: auto;
+				border-bottom: 1px solid #e1e1e1;
+				&:last-child{
+					border-bottom: none;
+				}
 			}	
 			.goods-pros-t{
 				display: flex;
 				align-items: center;
 				width: 100%;
-				height: 217rpx;
-				padding:12rpx 0;
+				height: 180rpx;
+				padding:20rpx 0;
 				.pros-img{
-					width: 210rpx;
-					height: 100%;
+					width: 180rpx;
+					height: 180rpx;
 					border-radius: 10rpx;
 					margin:0 26rpx 0 0;
 					border:1px solid #f3f3f3;
@@ -251,13 +261,16 @@
 					-webkit-box-orient: vertical;
 					-webkit-line-clamp: 2;
 					overflow: hidden;
-					margin-bottom: 58rpx;
+					margin-bottom: 28rpx;
 				}
 				.productspec{
 					height: 36rpx;
-					color: $text-color;
+					color: #999999;
 					line-height: 36rpx;
 					font-size: $font-size-26;
+					.color{
+						color: $text-color;
+					}
 				}
 			}		
 		}
@@ -361,13 +374,13 @@
 				display: none;
 			}	
 			.clipboard{
-				width: 74rpx;
+				width: 80rpx;
 				height: 40rpx;
-				background: linear-gradient(270deg, #c4761f 0%, #fccd90 100%);
+				background: #fff8fd;
 				text-align: center;
 				font-size: $font-size-22;
-				color: #FFFFFF;
-				border-radius: 20rpx;
+				color: #ff457b;
+				border-radius: 7rpx;
 				line-height: 40rpx;
 				display: inline-block;
 			}

pages/user/order/search-order.vue

@@ -735,13 +735,13 @@
 			width: 56rpx;
 			height: 56rpx;
 			float: left;
-			box-sizing: border-box;
-			margin-right: 10rpx;
+			border-radius: 8rpx;
 			border: 1px solid #e1e1e1;
+			margin-right: 8rpx;
 			image{
+				border-radius: 8rpx;
 				width: 56rpx;
 				height: 56rpx;
-				display: block;
 			}
 		}
 		.title-text{

services/ajax.env.js

@@ -0,0 +1,15 @@
+let URL_CONFIG = ''
+if(process.env.NODE_ENV === 'development'){
+    // 开发环境
+	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
+	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
+	// URL_CONFIG = 'http://192.168.2.81:8008'
+	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
+    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+	// URL_CONFIG = 'https://spi.caimei365.com'
+}else{
+    // 生产环境
+	// URL_CONFIG = 'https://spi-b.caimei365.com'
+    URL_CONFIG = 'https://spi.caimei365.com'
+}
+export default URL_CONFIG

services/ajax.service.js

@@ -1,39 +1,40 @@
 /**
  * ajax请求相关的服务
  */
-import baseUrl from './config.env'
-import {
-	msg
-} from '@/utils/util'
+import spiServiceUrl from './ajax.env'
+import corServiceUrl from './config.env'
+import { msg } from '@/utils/util'
 
 class AjaxService {
 	constructor() {
 		this.name = 'AjaxService'
 	}
-	getBaseUrl(url = '') {
-		return url.indexOf('://') > -1 ? url : baseUrl + url
+	getBaseUrl (url = '') {
+		return url.indexOf('://') > -1 ? url : url
 	}
-	getHeaders({
-		header = {}
-	}) {
+	getHeaders({ header = {} }) {
+		const REV_TOKEN_ENV = uni.getStorageSync('token') ? uni.getStorageSync('token') : 'X-token';
+		const REV_COOKIE_ENV = uni.getStorageSync('sessionid') ? uni.getStorageSync('sessionid') : 'sessionid';
 		header['Accept'] = 'application/json'
-		// header['Content-Type'] = 'application/x-www-form-urlencoded'
-		header['Content-Type'] = 'application/json'
+		header['Content-Type'] = 'application/x-www-form-urlencoded'
+		header['X-Token'] = REV_TOKEN_ENV
+		header['cookie'] = REV_COOKIE_ENV
 		return header
 	}
 	request(options = {}) {
 		let header = this.getHeaders(options)
+		let url = this.getBaseUrl(options.url)
 		if (options.header) {
 			header = Object.assign(header, options.header)
 		}
-		let url = this.getBaseUrl(options.url)
-		let {
-			isLoading = true
-		} = options
+		if(options.isHost){
+			url = corServiceUrl + url
+		}else{
+			url = spiServiceUrl + url
+		}
+		let { isLoading = true } = options
 		if (isLoading) {
-			wx.showLoading({
-				title: '加载中'
-			})
+			wx.showLoading({ title: '加载中' })
 		}
 		const requestPromise = new Promise((resolve, reject) => {
 			uni.request({
@@ -42,10 +43,10 @@ class AjaxService {
 				data: options.data || {},
 				header,
 				success: res => {
-					if (isLoading) wx.hideLoading()
-					if (options.isStatus) {
+					if (isLoading) wx.hideLoading();
+					if(options.isStatus){
 						resolve(res.data)
-					} else {
+					}else{
 						if (res.data.code === 0) {
 							resolve(res.data)
 						} else {

services/public.js

@@ -4,47 +4,10 @@
  *@date 2020/03/19 14:56:57
  *@param registerByPass
  */
-import requestUrl from '@/services/config.env.js'
+import requestUrl from '@/services/ajax.env.js'
 import request from '@/common/config/utilsTools.js'
 import $reg from '@/common/config/common.js'
 
-
-/**
- *获取省市区列表
- */
-export function queryAddressInformation() {
-	return new Promise(function(resolve, reject) {
-		request.get('/club/address', {}, res => {
-			if (res.code == 0) {
-				resolve(res)
-			} else {
-				return new Promise(function(resolve, reject) {
-					request.get('/club/address', {}, res => {
-						if (res.code == 0) {
-							resolve(res)
-						} else {
-							reject(res)
-						}
-					})
-				})
-			}
-		})
-	})
-}
-/**
- *获取协议
- */
-export function queryProtocol() {
-	return new Promise(function(resolve, reject) {
-		request.get('/club/protocol', {}, res => {
-			if (res.code == 0) {
-				resolve(res)
-			} else {
-				reject(res)
-			}
-		})
-	})
-}
 /**
  *上传图片
  */

services/public.service.js

@@ -6,18 +6,15 @@ export default class PublicService {
 		Object.assign(this, { AjaxService })
 		this.name = 'PublicService'
 	}
-	/**
-	 * 获取图形验证码
-	 * platformType:小程序 2  WWW 0  CRM 1 
-	 */
-	GetImgVerifyCode (data = {platformType:2}) {
-		return this.AjaxService.get({ url:'/user/getImgVerifyCode', data, isLoading: true })
-	}
 	/**
 	 * 获取图形验证码
 	 * activateCodeType:机构 2  供应商 3 找回密码 1 
 	 */
-	GetMobileCode (data = {}) {
-		return this.AjaxService.get({ url:'/user/activateCodeByReg', data, isLoading: true })
+	GetAllAddressData (data = {}) {
+		return this.AjaxService.get({ 
+			url:'/club/address', 
+			data, 
+			isLoading: true ,
+		})
 	}
 }

services/user.service.js

@@ -11,10 +11,11 @@ export default class UserService {
 	/* 初始化授权登录 */
 	userInfoLogin(data = {}) {
 		return this.AjaxService.post({
-			url: '/buyer/authorization',
+			url: '/user/login/auth/applets',
 			data,
 			isLoading: false,
-			isStatus: false
+			isStatus: false,
+			isHost:true
 		})
 	}
 	/* 初始化个人中心数据 */
@@ -44,7 +45,7 @@ export default class UserService {
 	 */
 	QueryAddressList(data = {}) {
 		return this.AjaxService.get({
-			url: '/other/findAddress',
+			url: '/personalCenter/findAddress',
 			data,
 			isLoading: true
 		})