美业卡项

后端研发-苏泰源
1 parent ef0d3dcb
Showing 16 changed files with 1225 additions and 205 deletions
app.wxss
packageA/pages/details_serviceCard/details_serviceCard.js
packageA/pages/details_serviceCard/details_serviceCard.wxml
packageA/pages/details_serviceCard/details_serviceCard.wxss
pages/goods/categoryList/categoryList.js
pages/goods/categoryList/categoryList.wxml
pages/index/index/index.json
pages/index/index/index.wxml
pages/payment/pay_success/pay_success.js
pages/payment/pay_success/pay_success.wxml
pages/payment/pay_success/pay_success.wxss
pages/store/index.wxss
pages/user/order_list/order_list.js
pages/user/order_list/order_list.wxml
utils/filter.wxs
utils/request.js
@@ -135,6 +135,7 @@
 	box-sizing: border-box;
 }
+
 .c-green {
 	color: #7CFC00;
 }
@@ -159,6 +160,14 @@
 	color: #c7c7c7;
 }
+.c-6 {
+	color: #666;
+}
+
+.c-9 {
+	color: #999;
+}
+
 .c-d {
@@ -232,6 +241,11 @@
 	margin-top: 30rpx;
 }
+.mgt40 {
+	margin-top: 40rpx;
+}
+
+
 .h68 {
 	height: 68rpx;
 }
@@ -729,9 +743,9 @@ background: #ffe3e2;
 /* 图标字体(ty) */
 @font-face {
   font-family: 'iconfont';  /* Project id 2054717 */
-  src: url('//at.alicdn.com/t/font_2054717_kwrwze5y6c.woff2?t=1635844276600') format('woff2'),
-       url('//at.alicdn.com/t/font_2054717_kwrwze5y6c.woff?t=1635844276600') format('woff'),
-       url('//at.alicdn.com/t/font_2054717_kwrwze5y6c.ttf?t=1635844276600') format('truetype');
+  src: url('//at.alicdn.com/t/font_2054717_y42sikta7lc.woff2?t=1642407649188') format('woff2'),
+       url('//at.alicdn.com/t/font_2054717_y42sikta7lc.woff?t=1642407649188') format('woff'),
+       url('//at.alicdn.com/t/font_2054717_y42sikta7lc.ttf?t=1642407649188') format('truetype');
 }
 .iconfont {
@@ -742,6 +756,18 @@ background: #ffe3e2;
   -moz-osx-font-smoothing: grayscale;
 }
+.icon-shangpin:before {
+  content: "\e661";
+}
+
+.icon-bankcard:before {
+  content: "\e693";
+}
+
+.icon-tongbu:before {
+  content: "\e6ca";
+}
+
 .icon-luck:before {
   content: "\e621";
 }
 // packageA/pages/details_serviceCard/details_serviceCard.js
+const app = getApp();
+const os = app.globalData.setting;
+let self = null;
+
 Page({
-  /**
-   * 页面的初始数据
-   */
-  data: {
+	/**
+	 * 页面的初始数据
+	 */
+	data: {
+		is_summit_ing: 0,
+	},
+
+	/**
+	 * 生命周期函数--监听页面加载
+	 */
+	onLoad: function(options) {
+		self = this;
+		this.data.options = options;
+		app.isLogin().then(function(data) {
+			self.setData({
+				userInfo: data,
+			});
+			self.getConfig();
+		});
+	},
+
+	/**
+	 * 生命周期函数--监听页面初次渲染完成
+	 */
+	onReady: function() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面显示
+	 */
+	onShow: function() {
+		if (app.globalData.userInfo) {
+			if (!this.data.isLogin) {
+				this.setData({
+					userInfo: app.globalData.userInfo,
+					imghost: app.globalData.setting.imghost,
+					isLogin: true,
+				});
+
+				let url = '/api/weshop/recharge/user/page'
+				let data = {
+					store_id: app.globalData.setting.stoid,
+					user_id: this.data.userInfo.user_id,
+					order_id: this.data.options.order_id,
+				};
+
+				// 请求数据
+				app.promiseGet(url, {
+					data: data,
+				}).then(res => {
+					if (res.data.code == 0) {
+						console.log('请求成功', res);
+						this.setData({
+							details: res.data.data.pageData[0],
+						});
+					} else {
+						throw (res);
+					};
+				}).catch(err => {
+					wx.showToast({
+						title: err.data.data,
+						icon: 'error',
+					});
+				});
+
+			};
+		};
+	},
+
+	/**
+	 * 生命周期函数--监听页面隐藏
+	 */
+	onHide: function() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面卸载
+	 */
+	onUnload: function() {
+
+	},
+
+	/**
+	 * 页面相关事件处理函数--监听用户下拉动作
+	 */
+	onPullDownRefresh: function() {
+
+	},
+
+	/**
+	 * 页面上拉触底事件的处理函数
+	 */
+	onReachBottom: function() {
+
+	},
+
+	/**
+	 * 用户点击右上角分享
+	 */
+	onShareAppMessage: function() {
+
+	},
+
+
+	// 内容复制到剪贴板
+	copy() {
+		console.log('点击了复制按钮');
+		wx.setClipboardData({
+			data: this.data.details.order_sn,
+			success(res) {
+				wx.getClipboardData({
+					success(res) {
+						console.log(res.data);
+					}
+				})
+			}
+		})
+	},
+
+
+	// 图片异常时加载默认图片
+	bind_bnerr(e) {
+		var errImg = e.currentTarget.dataset.errorimg;
+		var errObj = {};
+		errObj[errImg] = 'public/images/default_goods_image_240.gif';
+		this.setData(errObj); // this.setData({ details.list[0].img_url});    
+	},
+
+
+	// 查看商品详情
+	viewDetails(e) {
+		let goods_id = e.currentTarget.dataset.gid;
+		let url = '/packageA/pages/goodsInfo/goodsInfo?goods_id=' + goods_id;
+		app.goto(url);
+	},
+
+	// 获取系统参数
+	getConfig() {
+		app.getConfig2(function(e) {
+			// console.log('101',e);
+			let json_d = JSON.parse(e.switch_list);
+			self.setData({
+				sys_switch: json_d,
+				// weapp_customertype: json_d.weapp_customertype,
+			});
+		}, 1);
+	},
+
+
+	// 联系微信客服
+	contact_wx() {
+		var url = this.data.sys_switch.weapp_customertype_url;
+		var id = this.data.sys_switch.weapp_customertype_appid;
+		wx.openCustomerServiceChat({
+			extInfo: {
+				url: url
+			},
+			corpId: id,
+			success(res) {}
+		})
+	},
+
+
+	// 联系电话客服
+	contactService() {
+		app.getConfig(function(t) {
+			if (t.store_tel == undefined) {
+				app.request.get('/api/weshop/store/get/' + os.stoid, {
+					isShowLoading: 1,
+					data: {},
+					success: function(rs) {
+						app.globalData.config = rs.data.data;
+						if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
+							app.my_warnning('商家未设置电话', 0, self);
+							return false;
+						}
+						app.confirmBox('请联系客服:' + rs.data.data.store_tel);
+					}
+				})
+			} else {
+				app.confirmBox('请联系客服:' + t.store_tel);
+			}
+		});
+	},
+
+
+	// 评价商品
+	access() {
+		let listLength = this.data.details.list.length;
+		let order_id = this.data.details.order_id;
+		let url = '';
+
+		// 卡项订单跳转到评论页要多加个参数card=1
+		// 卡项订单goods_id要带card_id
+		if (listLength == 1) {
+			let price = this.data.details.list[0].price;
+			let card_id = this.data.details.list[0].card_id;
+			url =
+				`/packageB/pages/user/add_comment/add_comment?card=1&goods_id=${card_id}&order_id=${order_id}&price=${price}`
+		};
+		if (listLength > 1) {
+			url = `/packageB/pages/user/comment/comment?card=1&status=0&order_id=${order_id}`;
+		};
+		f
+		// console.log('url', url);
+		app.goto(url);
+	},
+
+
+	// 查看评论
+	viewComment() {
+		let order_id = this.data.details.order_id;
+		let card_id = this.data.details.list[0].card_id;
+		let listLength = this.data.details.list.length;
+		let url = '';
+
+		// 卡项订单单个商品
+		if (listLength == 1) {
+			url = `/packageB/pages/user/view_comment/view_comment?card=1&goods_id=${card_id}&order_id=${order_id}`;
+		};
+		// 卡项订单多个商品
+		if (listLength > 1) {
+			// status控制评论列表页的activeStatus
+			url = `/packageB/pages/user/comment/comment?card=1&status=1&order_id=${order_id}`;
+		};
+
+		app.goto(url);
+	},
+
+
+	// 再来一单
+	buy2(t) {
+		let details = this.data.details;
+		var th = this;
+		var ind = 1; // 1：加入购物车
+		// var ind = t.currentTarget.dataset.openSpecModal_ind;
+		// var action= t.currentTarget.dataset.action;
+		var action = 'add'; //
+		// if(!ind)  ind = t.currentTarget.dataset.openspecmodal_ind;
+
+		th.setData({
+			open_ind_store: ind
+		});
+
+		// if(!th.data.sto_sele_name){
+		//       getApp().my_warnning('请选择门店', 1, th, 450);
+		//       return false;
+		//   }
+
+
+		if (action == "buy") {
+			//--------------此时操作的数据------------
+			// var newd = {
+			//   id: th.data.data.id,
+			//   goods_num: th.data.goodsInputNum,
+			//   pick_id: th.data.sto_sele_id,		
+			//   keyid: th.data.sto_sele_keyid,		
+			// };	  
+			// newd['pick_name'] = th.data.sto_sele_name;		
+			// newd['guide_id'] = getApp().globalData.guide_id;
+			// newd['guide_type']=0;
+			// th.buyNow(newd);
+		} else {
+
+			var newd = {
+				// service_id: th.data.data.id,
+				// service_sn:th.data.data.service_sn,
+				// service_name:th.data.data.goods_name,
+				// goods_num: th.data.goodsInputNum,
+				// pick_id: th.data.sto_sele_id,
+				// user_id:oo.user_id,
+				// store_id:os.stoid,
+				// money:th.data.data.shop_price,
+
+				service_id: details.list[0].card_id,
+				service_sn: details.list[0].service_sn,
+				service_name: details.list[0].service_name,
+				goods_num: details.list[0].qty,
+				pick_id: details.list[0].pickup_id,
+				user_id: this.data.userInfo.user_id,
+				store_id: app.globalData.setting.stoid,
+				money: details.list[0].price,
+			};
+			if (getApp().globalData.guide_id) {
+				newd['guide_id'] = getApp().globalData.guide_id;
+				newd['guide_type'] = 0;
+			}
+
+			//----先看会员在购物车中是否加入了该商品-----
+			app.request.get("/api/weshop/cartService/page", {
+				data: {
+					store_id: app.globalData.setting.stoid,
+					user_id: this.data.userInfo.user_id,
+					service_id: details.list[0].card_id,
+					pick_id: details.list[0].pickup_id,
+				},
+				success: function(re) {
+
+					//-------如果购物车中有相关的数据---------
+					if (re.data.data.total > 0) {
+						var item = re.data.data.pageData[0];
+						var updata = {
+							id: item.id,
+							goods_num: details.list[0].qty + item.goods_num,
+							money: details.list[0].price,
+							store_id: app.globalData.setting.stoid,
+						};
+
+						if (getApp().globalData.guide_id) {
+							updata['guide_id'] = getApp().globalData.guide_id;
+							updata['guide_type'] = 1;
+						}
+						getApp().request.put("/api/weshop/cartService/update", {
+							data: updata,
+							success: function(t) {
+								// getApp().my_warnning('加入购物车成功', 1, th, 450);
+								var c_num = th.data.cartGoodsNum + th.data.goodsInputNum;
+								th.setData({
+									cartGoodsNum: c_num
+								});
+								app.goto('/pages/cart/cart/cart');
+								// th.closeSpecModal();
+							}
+						});
+					} else {
+
+						getApp().request.post("/api/weshop/cartService/save", {
+							data: newd,
+							success: function(t) {
+								// getApp().my_warnning('加入购物车成功', 1, th, 450);
+								var c_num = th.data.cartGoodsNum + th.data.goodsInputNum;
+								th.setData({
+									cartGoodsNum: c_num
+								});
+								app.goto('/pages/cart/cart/cart');
+								// th.closeSpecModal();
+							}
+						});
+					}
+				}
+			});
+
+		}
+	},
+
+
+	// 取消订单
+	// api/weshop/recharge/update?store_id=&order_id=&order_status=3
+	cancle() {
+		wx.showModal({
+			title: '提示',
+			content: '确定取消订单吗？',
+			success(res) {
+				if (res.confirm) {
+					console.log('用户点击确定');
+					let order_id = self.data.details.order_id;
+					let order_sn = self.data.details.order_sn;
+					app.request.put('/api/weshop/recharge/update', {
+						data: {
+							store_id: os.stoid,
+							order_id: order_id,
+							order_sn: order_sn,
+							order_status: 3,
+						},
+						success: function(res) {
-  },
+							//取消成功刷新订单
+							let url = '/api/weshop/recharge/user/page'
+							let data = {
+								store_id: app.globalData.setting.stoid,
+								user_id: self.data.userInfo.user_id,
+								order_id: self.data.options.order_id,
+							};
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
+							// 请求数据
+							app.promiseGet(url, {
+								data: data,
+							}).then(res => {
+								if (res.data.code == 0) {
+									console.log('请求成功', res);
+									wx.showToast({
+										title: '取消成功',
+									});
+									self.setData({
+										details: res.data.data.pageData[0],
+									});
+								} else {
+									throw (res);
+								};
+							}).catch(err => {
+								wx.showToast({
+									title: err.data.data,
+									icon: 'error',
+								});
+							});
-  },
+						},
+					})
+				} else if (res.cancel) {
+					console.log('用户点击取消');
+				}
+			}
+		});
+	},
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-  },
+	// 立即支付
+	pay() {
+		let order_sn = this.data.details.order_sn;
+		let store_id = app.globalData.setting.stoid;
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
+		app.request.post('/api/weshop/order/pay/createRechargeOrder', {
+			data: {
+				parentSn: order_sn,
+				store_id: store_id,
+			},
-  },
+			success: function(res) {
+				var n = res.data.data;
+				self.weixinPay(n, function() {
+					app.showWarning('支付成功');
+					// setTimeout(function() {
+					// 	wx.reLaunch({
+					// 		url: '/pages/user/my_service/i_service',
+					// 	})
+					// }, 1000)
+				}, function() {
+					app.showWarning('支付失败');
+					// setTimeout(function() {
+					// 	wx.reLaunch({
+					// 		url: '/packageA/pages/cardList/cardList',
+					// 	})
+					// }, 1000)
+				});
+			}
+		})
+	},
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-  },
+	//------调起支付框--------
+	weixinPay: function(n, success, fail) {
+		if (!n) return false;
+		wx.requestPayment({
+			timeStamp: String(n.timeStamp),
+			nonceStr: n.nonceStr,
+			package: n.packageValue,
+			signType: n.signType,
+			paySign: n.paySign,
+			success: function(n) {
+				console.log(n), getApp().showSuccess("支付成功！");
+				"function" == typeof success && success();
+				wx.redirectTo({
+					url: "../deposit/deposit"
+				});
+			},
+			fail: function(n) {
+				console.log(n), "requestPayment:fail" == n.errMsg ? getApp().showWarning("支付失败") :
+					"requestPayment:fail cancel" == n.errMsg ? getApp().showWarning("您已取消支付") : getApp().showWarning("支付失败：" + n
+						.errMsg.substr("requestPayment:fail ".length)),
+					"function" == typeof fail && fail();
+			}
+		});
+	},
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-  },
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-  },
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-  },
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-  }
-})
 \ No newline at end of file
+})
+<wxs module="filter" src="../../../utils/filter.wxs"></wxs>
+
 <view class="main">
 	<view class="bg-white pdh20 bdr12">
-		<!-- 门店名称栏 -->
-		<view class="flex jc_sb ai_c pdv20">
-			<view class="ellipsis-1 pdr40 fs30"><text class="iconfont icon-shop c-red pdr10"></text>门店名称名称名称名称名称名称名称名称名称名称</view>
-			<text class="c-red shrink0 fs26">待评价</text>
-		</view>
-		<!-- 列表栏 -->
-		<view>
-			<view class="flex pdv20">
-				<view class="pic-box shrink0"><image class="img-block" src="../../images/wx2.png"></image></view>
-				<view class="pdl20 f1">
-					<view class="flex jc_sb ai_c">
-						<view class="title ellipsis-2 pdr40">我是商品标题</view>
-						<text class="rmb c-6">10</text>
+		<block wx:for="{{details.list}}">
+			<!-- 门店名称栏 -->
+			<view class="flex jc_sb ai_c pdv20">
+				<view class="ellipsis-1 pdr40 fs30"><text class="iconfont icon-shop c-red pdr10"></text>{{item.pickup_name}}</view>
+				<!-- 订单状态 -->
+				<block>
+					<text class="c-red shrink0 fs26" wx:if="{{details.order_status == 0}}">待支付</text>
+					<text class="c-red shrink0 fs26" wx:if="{{details.order_status == 1}}">待评价</text>
+					<text class="c-red shrink0 fs26" wx:if="{{details.order_status == 2}}">已评价</text>
+					<text class="c-red shrink0 fs26" wx:if="{{details.order_status == 3}}">已取消</text>
+					<text class="c-red shrink0 fs26" wx:if="{{details.order_status == 5}}">已作废</text>
+				</block>
+			</view>
+			
+			<!-- 列表栏 -->
+			<view>
+				<!-- <view class="flex pdv20" wx:for="{{details.list}}" bindtap="viewDetails" data-gid="{{item.card_id}}"> -->
+				<view class="flex pdv20" bindtap="viewDetails" data-gid="{{item.card_id}}">
+					<view class="pic-box shrink0">
+						<image class="img-block" src="{{imghost + item.img_url}}" binderror="bind_bnerr" lazy-load="{{true}}" data-errorimg="details.list[{{index}}].img_url"></image>
 					</view>
-					<view class="flex jc_sb ai_c c-9 fs24">
-						<text>10个/蓝色</text>
-						<text>x1</text>
+					<view class="pdl20 f1">
+						<view class="flex jc_sb ai_c">
+							<view class="title ellipsis-2 pdr40">{{item.service_name}}</view>
+							<text class="rmb c-6">{{item.price}}</text>
+						</view>
+						<view class="flex jc_sb ai_c c-9 fs24">
+							<!-- <text>10个/蓝色</text> -->
+							<text>x{{item.qty}}</text>
+						</view>
 					</view>
 				</view>
 			</view>
-		</view>
+		</block>
+		
+		
 		<!-- 统计栏 -->
-		<view class="t-r bdt pdv20">共2件商品，合计：<text class="rmb c-red bold fs30">21.00</text></view>
+		<view class="t-r bdt pdv20">共{{filter.count(details.list)}}件商品，合计：<text class="rmb c-red bold fs30">{{details.account}}</text></view>
 	</view>
+	
+	
 	<view class="bg-white pdh20 mgt20 bdr12">
 		<!-- 订单信息栏 -->
 		<view class="pdv20">订单信息</view>
+		
 		<view class="flex jc_sb pdb20 ai_c">
-			<view><text class="c-9">订单编号：</text>fwk20221252125222212 </view>
-			<text class="btn-copy">复制</text>
+			<view><text class="c-9">订单编号：</text>{{details.order_sn}}</view>
+			<text class="btn-copy" bindtap="copy">复制</text>
 		</view>
-		<view class="pdb20"><text class="c-9">下单时间：</text>2021-12-27 18:00:00</view>
+		<view class="pdb20"><text class="c-9">下单时间：</text>{{filter.format_time(details.ctime, 1)}}</view>
+		
 		<!-- 联系客服栏 -->
 		<view class="flex t-c bdt">
-			<view class="f1 pd20"><text class="iconfont icon-kefu c29f pdr20"></text>联系客服</view>
-			<view class="f1 pd20 separator"><text class="iconfont icon-tongbu c-orange pdr20"></text>卡项同步</view>
+			<!-- 客服 -->
+			<block>
+				<button class="f1" wx:if="{{sys_switch.weapp_customertype == 1}}" hover-class="none" open-type="contact"
+			 session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}"><text class="iconfont icon-kefu c29f pdr10 fs36"></text>联系客服</button>
+				<view class="f1 pd20" wx:elif="{{sys_switch.weapp_customertype== 2}}" bindtap="contact_wx"><text class="iconfont icon-kefu c29f pdr10 fs36"></text>联系客服</view>
+				<view class="f1 pd20" wx:else bindtap="contactService"><text class="iconfont icon-kefu c29f pdr10 fs36"></text>联系客服</view>
+			</block>
+			<!-- 卡项同步先不做 -->
+			<!-- <view class="f1 pd20 separator"><text class="iconfont icon-tongbu c-orange pdr20"></text>卡项同步</view> -->
 		</view>
 	</view>
+	
 	<!-- 底部按钮栏 -->
 	<view class="btn-bar t-r bg-white pd20">
-		<text class="btn btn-border">立即评价</text>
-		<text class="btn bg-red white mgl20">再来一单</text>
+		<!-- 待支付 -->
+		<block wx:if="{{details.order_status == 0}}">
+			<text class="btn btn-border" bindtap="cancle">取消订单</text>
+			<text class="btn bg-red white mgl20" bindtap="pay">立即支付</text>
+		</block>
+		<!-- 已支付/未评价 -->
+		<block wx:if="{{details.order_status == 1}}">
+			<text class="btn bg-orange white" bindtap="buy2">再来一单</text>
+			<text class="btn bg-red white mgl20" bindtap="access">立即评价</text>
+		</block>
+		<!-- 已评价 -->
+		<block wx:if="{{details.order_status == 2}}">
+			<text class="btn bg-orange white" bindtap="buy2">再来一单</text>
+			<text class="btn bg-red white mgl20" bindtap="viewComment">查看评价</text>
+		</block>
 	</view>
 </view>
@@ -18,6 +18,7 @@ page {
 	border: 2rpx solid #808080;
 }
+
 .bg-red {
 	background-image: -webkit-linear-gradient(315deg,#f2140c,#f2270c 70%,#f24d0c);
 	background-image: linear-gradient(135deg,#f2140c,#f2270c 70%,#f24d0c);
@@ -67,7 +67,10 @@ Page({
     status_show:0,
     currentTab: 0, //预设当前项的值
-	load:0,
+    load:0,
+    xmlist: null,
+  
+
   },
@@ -134,6 +137,7 @@ Page({
       if (this.data.is_used_share==0){  
         this.get_nation();
+        this.getServiceCategory();
       }
       //风格三
@@ -202,7 +206,7 @@ Page({
 		if(this.data.load) return false;
         getApp().getConfig2(function (e) {
-
+				console.log('card------------>>>>', e);
         var data=e;
         var switch_list_data = data.switch_list;
         var switch_list = JSON.parse(switch_list_data);
@@ -215,13 +219,14 @@ Page({
         if (e.categoryset.indexOf("," + 1 + ",") != -1) { that.setData({ is_show_pl: 1 }); }
         if (e.categoryset.indexOf("," + 3 + ",") != -1) { that.setData({ is_show_pp: 1 }); }
         if (e.categoryset.indexOf("," + 2 + ",") != -1) { that.setData({ is_show_gb: 1 }); }
+        if (e.categoryset.indexOf("," + 4 + ",") != -1) { that.setData({ is_show_xm: 1 }); }
         that.setData({ store_config: e,is_do:1 });
         //---有勾品类---
         if (that.data.is_show_pl){
            that.requestFirstCategoris();
         }
-        if (that.data.is_show_gb != 1 && that.data.is_show_pp != 1 && that.data.is_show_pl){     
+        if (that.data.is_show_xm != 1 && that.data.is_show_gb != 1 && that.data.is_show_pp != 1 && that.data.is_show_pl){     
             that.data.pl_timer = setInterval(function () {
                  if (that.data.one_level_classify.length>0){
                      var item=that.data.one_level_classify[0],arr=item.array;
@@ -259,6 +264,7 @@ Page({
         if (that.data.is_show_pl) that.setData({ currentTab: 0 });
         else if (that.data.is_show_gb){ that.setData({ currentTab: 1 });that.get_nation();  }
         else if (that.data.is_show_pp) {that.setData({ currentTab: 2 });that.get_brand(); }
+        else if (that.data.is_show_xm) {that.setData({ currentTab: 3 });that.getServiceCategory(); }
         //----求传参过来的控制-----
         if (getApp().globalData.cat_type == 1 && that.data.is_show_gb ) {
@@ -267,6 +273,9 @@ Page({
         } else if (getApp().globalData.cat_type == 2 && that.data.is_show_pp ) {
           that.setData({ currentTab: 2 });
           that.get_brand();
+        } else if (getApp().globalData.cat_type == 3 && that.data.is_show_xm ) {
+          that.setData({ currentTab: 3 });
+          that.getServiceCategory();
         } else if (that.data.is_show_pl) {
           that.setData({ currentTab: 0 });
         }
@@ -277,7 +286,7 @@ Page({
           that.setData({ status_show: 2 });
         }
-		that.data.load=1;
+      that.data.load=1;
       })
     },
@@ -402,6 +411,13 @@ Page({
       if (e.detail.current == 2 && that.data.groups == null) {
         that.get_brand();
       }
+
+      //获取服务卡项
+      if (e.detail.current == 3 && that.data.xmlist == null) {
+        that.getServiceCategory();
+      }
+
+
     },
     //-----------点击切换-----------
     clickTab: function (e) {
@@ -422,9 +438,15 @@ Page({
         if (e.detail.current == 2 && that.data.groups == null) {
            that.get_brand();
         }
+
+        //获取服务卡项
+        if (e.detail.current == 3 && that.data.xmlist == null) {
+          that.getServiceCategory();
+       }
+
     },
-    tabLetter(e) {
+  tabLetter(e) {
       const index = e.currentTarget.dataset.index;
       this.setData({
         selected: index,
@@ -488,8 +510,9 @@ Page({
     var lurl = "/pages/goods/goodsList/goodsList?nation_id=" + cid;
     wx.navigateTo({ url: lurl });
   },
+  
   //获取国别
-  get_nation:function(){
+  get_nation:function() {
     var s = this;
     e.get("/api/weshop/nation/page", {
       data: {
@@ -575,6 +598,33 @@ Page({
       }
     });
   },
+
+
+  // 获取服务卡项分类
+  getServiceCategory: function() {
+    var s = this;
+    e.get("/api/weshop/serviceCategory/page", {
+      data: {
+        is_show: 1,
+        store_id:oo.stoid,
+				pageSize: 1000,
+      },
+      success: function (e) {
+        var dda = e.data.data.pageData;
+        s.setData({ 
+					xmlist:dda,
+				});
+      }
+    });
+  },
+
+  
+  goServiceCategoryList: function(t) {
+    var cid = t.currentTarget.dataset.cid;
+    var lurl = "/packageA/pages/cardList/cardList?cat_id=" + cid;
+    wx.navigateTo({ url: lurl });
+  },
+
   //---------分享配置--------
   onShareAppMessage: function (e) {
@@ -659,7 +709,7 @@ Page({
   let cur = e.currentTarget.dataset.current;
   if(cur) {
       if (this.data.currentTab == cur) {
-          if (this.data.select_classify_on != 220 && this.data.select_classify_on != 223) {
+          if (this.data.select_classify_on != 220 && this.data.select_classify_on != 221 && this.data.select_classify_on != 223) {
               return false;
           } else if (cur != 0) {
               return false;
@@ -746,6 +796,8 @@ Page({
     _errObj[_errImg] = "/miniapp/images/default_g_img.gif";
     this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
   },
+	
+	
   //选择更多
   select_more:function(e){ 
     var cid = e.currentTarget.dataset.cid;
@@ -754,6 +806,8 @@ Page({
     wx.navigateTo({ url: lurl });
   },
+	
+	
 //扫一扫
   getScancode:function(){
       var _this = this;
@@ -767,6 +821,8 @@ Page({
       }
     })
   },
+	
+	
   onUnload: function () {
     //this.destroyActivityTimer();
   },
@@ -12,6 +12,8 @@
               data-current="1" bindtap="clickTab">国家</view>
         <view  wx:if="{{is_show_pp}}" class="swiper-tab-item {{currentTab==2?'active':''}}" 
               data-current="2" bindtap="clickTab">品牌</view>
+				<view  wx:if="{{is_show_xm}}" class="swiper-tab-item {{currentTab==3?'active':''}}" 
+				      data-current="3" bindtap="clickTab">项目</view>
     </view> 
   </view>
   <view class="search-box "  bindtap="goseach">
@@ -22,7 +24,7 @@
             <input bindfocus="goseach" class="search-cont" placeholder="寻找好口碑" type="text"></input>
         </view>
   </view>
-  <block wx:if="{{is_show_pl || is_show_gb || is_show_pp }}">
+  <block wx:if="{{is_show_pl || is_show_gb || is_show_pp || is_show_xm}}">
    <swiper current="{{currentTab}}" duration="300"  bindanimationfinish="swiperTab" style="height:{{abc}}rpx;margin-bottom:120rpx">
       <!--------分类---------->
       <swiper-item >
@@ -86,6 +88,26 @@
               </view>
             </view>
       </swiper-item>
+			<!-------项目---------->
+			<swiper-item wx:if="{{is_show_xm}}">
+				<scroll-view scroll-y="true" class="fenlei-list" 
+				scroll-with-animation="true" lower-threshold="1" bindscrolltolower="scrolltolower"  style="height: {{abc}}rpx;" >
+					<block wx:for="{{xmlist}}" wx:for-item="fitem" >
+						<view class='f_item'>
+								<view  class="pic_view" bindtap="goServiceCategoryList" data-cid="{{fitem.id}}" data-pid="0">
+
+									<image wx:if="{{fitem.showImgType==1}}" binderror="bind_bnerr2" class='fl_img' data-errorimg="catelist[{{index}}].items.image" src='{{fitem.showImg}}'></image>
+									<image wx:else class='fl_img' binderror="bind_bnerr2" data-errorimg="catelist[{{index}}].items.image" src='{{iurl}}{{fitem.showImg}}'></image>
+									
+						<view class='over_view'></view> 
+							<text class='f_item_over_t'>{{fitem.name}}</text></view>
+							<view class='fenlei_text_v'>
+								<view class='f_text'  wx:for="{{fitem.array}}" wx:for-item="item" bindtap="goServiceCategoryList" data-cid="{{item.id}}" data-pid="{{item.parent_id}}">{{item.name}}</view>
+							</view>
+						</view> 
+						</block>
+				</scroll-view>
+			</swiper-item>
    </swiper>
    <view class="no-data" wx:if="{{!is_date}}">
       <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
@@ -103,7 +125,7 @@
 </block>
 <!-- 风格2 -->
 <block wx:elif="{{is_used_share == 1}}">
-    <block wx:if="{{is_show_pl || is_show_gb || is_show_pp }}">
+    <block wx:if="{{is_show_pl || is_show_gb || is_show_pp || is_show_xm}}">
 			<!-- 新版分类头部 -->
 			<view class="xc-search-box flex jc_sb ai-center" style="position:fixed;top:0;z-index:99">
 				<!-- <view class="xc-search-inner ">
@@ -129,38 +151,48 @@
                <!-- 分类项目的类型 -->
            <view class="project_type" style="background-color:#f4f4f4;overflow-y:auto;position:fixed;left:0;z-index:99;top:108rpx;">
            <view class="project_type-frame" style="margin-bottom:120rpx;">
-           <view wx:if="{{is_show_gb}}" class="{{status_show == 1?'':''}}">
+							<view wx:if="{{is_show_gb}}" class="{{status_show == 1?'':''}}">
            <!-- <view  style="{{status_show == 1?'position: absolute;height: 52rpx;width: 6rpx;background-color: red;left: 0; margin-top: 24rpx;':''}}"></view> -->
-              <view  bindtap="click_classify"  style="{{status_show == 1?'margin-top:0':'margin-top:40rpx'}}" class="fs30  {{select_classify_on==223?'select_classify':''}}"data-index="223"data-name="国家" wx:if="{{is_country}}">
-            
-							<!-- <view  class="tab-bar-item sort-name ellipsis-1" style="letter-spacing:50rpx;">国家</view> -->
-              <view  class="tab-bar-item sort-name ellipsis-1" style="">国家</view>
+								<view  bindtap="click_classify"  style="{{status_show == 1?'margin-top:0':'margin-top:40rpx'}}" class="fs30  {{select_classify_on==223?'select_classify':''}}" data-index="223" data-name="国家" wx:if="{{is_country}}">
+							
+								<!-- <view  class="tab-bar-item sort-name ellipsis-1" style="letter-spacing:50rpx;">国家</view> -->
+								<view class="tab-bar-item sort-name ellipsis-1" style="">国家</view>
+								</view>
               </view>
-              </view>
-              <view wx:if="{{is_show_pp}}" class="{{status_show == 2?'':''}}">
+							
+              <view wx:if="{{is_show_pp}}">
               <!-- <view  style="{{status_show == 2?'position: absolute;height: 52rpx;width: 6rpx;background-color: red;left: 0; margin-top: 24rpx;':''}}"></view> -->
-                <view bindtap="click_classify" class="{{select_classify_on==220?'select_classify':''}} fs30" wx:if="{{is_brand}}"data-index="220"data-name="品牌">
+                <view bindtap="click_classify" class="{{select_classify_on==220?'select_classify':''}} fs30" wx:if="{{is_brand}}" data-index="220" data-name="品牌">
-							<!-- <view  class="tab-bar-item sort-name ellipsis-1" style="letter-spacing:50rpx;">品牌</view> -->
-              <view  class="tab-bar-item sort-name ellipsis-1" style="">品牌</view>
-              </view>
+								<!-- <view  class="tab-bar-item sort-name ellipsis-1" style="letter-spacing:50rpx;">品牌</view> -->
+									<view  class="tab-bar-item sort-name ellipsis-1" style="">品牌</view>
+								</view>
               </view>
+							
+							<!-- 项目 -->
+							<view wx:if="{{is_show_xm}}">
+							  <view  bindtap="click_classify" class="fs30 {{select_classify_on==221?'select_classify':''}}" data-index="221" data-name="项目">
+									<view  class="tab-bar-item sort-name ellipsis-1">项目</view>
+								</view>
+							</view>
+							
+							
+							<!-- 品类 -->
               <view wx:if="{{is_show_pl}}">
-
-                <view wx:for="{{one_level_classify}}" wx:for-item="ittms" >
-                <view class="{{ittms.items.is_show_class == true?'is_show_class':''}}">
-                 <!-- 添加左边红色条 -->
-                 <!-- <view  style="{{ittms.items.is_show_class == true?'position: absolute;height: 52rpx;width: 6rpx;background-color: red;left: 0; margin-top: 24rpx;':''}}"></view> -->
-                 <view bindtap="click_classify" data-arr="{{ittms.array}}" data-cid="{{ittms.items.id}}" data-pid="0" class="{{select_classify_on==index?'select_classify width80':''}}  fs30 t-c  {{select_classify_on==index&&ittms.items.name.length==2?'':''}} {{select_classify_on==index&&ittms.items.name.length==3?'':''}}"data-index="{{index}}"data-name="{{ittms.items.mobile_name}}">
-               
-                   <view  class="tab-bar-item sort-name ellipsis-1">{{ittms.items.name}}</view>
-                 </view>
-
-              </view>
+                <view wx:for="{{one_level_classify}}" wx:for-item="ittms">
+									<view class="{{ittms.items.is_show_class == true?'is_show_class':''}}">
+									 <!-- 添加左边红色条 -->
+									 <!-- <view  style="{{ittms.items.is_show_class == true?'position: absolute;height: 52rpx;width: 6rpx;background-color: red;left: 0; margin-top: 24rpx;':''}}"></view> -->
+									 <view bindtap="click_classify" data-arr="{{ittms.array}}" data-cid="{{ittms.items.id}}" data-pid="0" class="{{select_classify_on==index?'select_classify width80':''}}  fs30 t-c  {{select_classify_on==index&&ittms.items.name.length==2?'':''}} {{select_classify_on==index&&ittms.items.name.length==3?'':''}}"data-index="{{index}}"data-name="{{ittms.items.mobile_name}}">
+								 
+										 <view  class="tab-bar-item sort-name ellipsis-1">{{ittms.items.name}}</view>
+									 </view>
+									</view>
+								</view>
+							</view>
+							
           </view>
-        </view>
-           </view>
         </view>
                <!-- 分类项目的内容 -->
@@ -211,11 +243,32 @@
         </block>
         </view>
         </block>
+				
+				<!-- 卡项 -->
+				<!-- <block wx:if="{{select_classify_on==220&&is_show_xm}}"> -->
+				<block wx:if="{{select_classify_on==221&&is_show_xm}}">
+					<view class="classify_name fs28 flex-space-between">
+						 <view>{{classify_name}}</view>
+					</view>
+					
+					<view class="classify_content-frame flex flex-wrap" style="padding-bottom: 130rpx;">
+					 <block wx:for="{{xmlist}}">
+						 <view class="brand_img_frame" bindtap="goServiceCategoryList" data-cid="{{item.id}}" >
+								<view class="t-c">
+									<image class="brand_img" src="{{item.ico}}" data-errorimg="xmlist[{{index}}].ico" binderror="bind_bnerr_pp" mode="heightFix"></image>
+									<view class="brand_img_name ellipsis-1 fs24">{{item.name}}</view>
+							  </view>
+						 </view>
+					</block>
+					</view>
+				</block>
+				
         <!-- 品类-->
-        <block  wx:if="{{is_show_pl}}">
-        <block wx:if="{{select_classify_on!=220&&select_classify_on!=223&&is_level_three!=1}}">
+        <block  wx:if="{{is_show_pl&&select_classify_on == 0}}">
+				<!-- <block wx:if="{{select_classify_on!=221&&select_classify_on!=220&&select_classify_on!=223&&is_level_three!=1}}"> -->
+        <block wx:if="{{select_classify_on == 0&&is_level_three!=1}}">
              <view class="my-container">
-                 <view class="classify_name fs28 flex-space-between ai-center"data-pid="0"data-cid="{{cat_id}}" bindtap='select_more'>
+                 <view class="classify_name fs28 flex-space-between ai-center" data-pid="0" data-cid="{{cat_id}}" bindtap='select_more'>
             <view class="classify_title ellipsis-1">{{classify_name}}</view>
               <view class="flex select_more ai-center" >
                 <view class="red-co fs24" >更多</view>
@@ -241,8 +294,8 @@
         </block>
         <!-- 商品 含有3级的-->
-        <block wx:if="{{select_classify_on!=220&&select_classify_on!=223&&is_level_three==1}}">
-        <block wx:for="{{goodslist}}"wx:for-item="goods"wx:for-index="inds">
+        <block wx:if="{{select_classify_on!=220&&select_classify_on!=221&&select_classify_on!=223&&is_level_three==1}}">
+        <block wx:for="{{goodslist}}" wx:for-item="goods" wx:for-index="inds">
         <view>
         <view class="classify_name fs28 flex-space-between ai-center"data-pid="{{goods.items.parent_id}}" data-cid="{{goods.items.id}}" bindtap='select_more'>
@@ -282,7 +335,7 @@
 </block>
 <!-- 风格3 -->
 <block wx:elif="{{is_used_share == 2}}">
-    <block wx:if="{{is_show_pl || is_show_gb || is_show_pp }}">
+    <block wx:if="{{is_show_pl || is_show_gb || is_show_pp || is_show_xm}}">
       <!-- 头部 -->
       <view class="xc-search-box flex-center white_b" id="navbar" style="position:fixed;top:0;z-index:99">
             <!-- <view class="share-height t-c" bindtap="getScancode" >
@@ -314,16 +367,27 @@
             <view class="project_type" style="background-color:#f4f4f4;overflow-y:auto;position:fixed;left:0;z-index:99;top:108rpx;" id="thress_type3">
               <view class="project_type-frame" style="margin-bottom:120rpx;">
                 <view wx:if="{{is_show_gb}}">
-                  <view  bindtap="click_classify"  class="tab-bar-item {{select_classify_on==223 ? 'active' : ''}}"  data-current="223" data-index="223" data-name="国家" wx:if="{{is_country}}">
+                  <view  bindtap="click_classify"  class="tab-bar-item {{select_classify_on==223 ? 'active' : ''}}" data-index="223" data-name="国家" wx:if="{{is_country}}">
                     <text style="">国家</text>
                   </view>
                 </view>
+								
                 <view wx:if="{{is_show_pp}}">
-                
-                  <view bindtap="click_classify"  class="tab-bar-item {{select_classify_on==220 ? 'active' : ''}}" wx:if="{{is_brand}}"  data-current="220" data-index="220" data-name="品牌">
+                  <view bindtap="click_classify"  class="tab-bar-item {{select_classify_on==220 ? 'active' : ''}}" wx:if="{{is_brand}}"  data-index="220" data-name="品牌">
                     <text style="">品牌</text>
                    </view>
                 </view>
+								
+								
+								<!-- 卡项 -->
+								<view wx:if="{{is_show_xm}}">
+								  <view bindtap="click_classify" class="tab-bar-item {{select_classify_on == 221 ? 'active' : ''}}" data-index="221" data-name="项目">
+								    <text>项目</text>
+								  </view>
+								</view>
+								
+								
+								
                 <view wx:if="{{is_show_pl}}">
                   <!-- <view wx:for="{{one_level_classify}}" wx:for-item="ittms" class="class_set_height"> -->
                   <!-- <view class="{{ittms.items.is_show_class == true?'is_show_class':''}}"> -->
@@ -356,6 +420,9 @@
                 <!-- </view> -->
               </view>
+							
+							
+							
             </view>
              </view>
             <!-- 分类项目的内容 -->
@@ -383,6 +450,8 @@
                </view>
         </view>
         </block>
+				
+				
         <!-- 品牌 -->
         <block wx:if="{{select_classify_on==220&&is_show_pp}}">
@@ -405,9 +474,31 @@
         </block>
         </view>
         </block>
+				
+				
+				<!-- 卡项 -->
+				<block wx:if="{{select_classify_on==221&&is_show_xm}}">
+					<view class="classify_name fs28 flex-space-between">
+						 <view>{{classify_name}}</view>
+					</view>
+					
+					<view class="classify_content-frame flex flex-wrap" style="padding-bottom: 130rpx;">
+					 <block wx:for="{{xmlist}}">
+						 <view class="brand_img_frame" bindtap="goServiceCategoryList" data-cid="{{item.id}}" >
+								<view class="t-c">
+									<image class="brand_img" src="{{item.ico}}" data-errorimg="xmlist[{{index}}].ico" binderror="bind_bnerr_pp" mode="heightFix"></image>
+									<view class="brand_img_name ellipsis-1 fs24">{{item.name}}</view>
+							 </view>
+						 </view>
+						</block>
+					</view>
+				</block>
+				
+				
         <!-- 品类-->
-        <block  wx:if="{{is_show_pl}}">
-          <block wx:if="{{select_classify_on!=220&&select_classify_on!=223}}">
+        <block  wx:if="{{select_classify_on==0&&is_show_pl}}">
+					<!-- <block wx:if="{{select_classify_on!=220&&select_classify_on!=223}}"> -->
+          <block wx:if="{{select_classify_on == 0}}">
               <view style="width:100%;height:100%;position: relative;">
                 <view class="classify_name fs28 flex ai-center flex-space-between" id="header" data-pid="0" data-cid="{{cat_id}}" bindtap='select_more' style="box-sizing:border-box;position:fixed;z-index: 999;width:74%;background-color:#ffffff;padding:0 20rpx;">
                   <view class="classify_title ellipsis-1">{{classify_name}}</view>
@@ -17,10 +17,11 @@
         "picMax": "/components/diy_picMax/diy_picMax",
         "mvideo": "/components/diy_video/diy_video",    
         "service": "/components/diy_service/diy_service",
-		"scan": "/components/diy_scan/diy_scan",
-		"store_select": "/components/diy_store_select/diy_store_select",
+				"scan": "/components/diy_scan/diy_scan",
+				"store_select": "/components/diy_store_select/diy_store_select",
         "presell": "/components/diy_pregoods/diy_pregoods",
-				"luckyGo": "/components/diy_luckyGo/diy_luckyGo"
+				"luckyGo": "/components/diy_luckyGo/diy_luckyGo",
+				"serviceCard": "/components/diy_serviceCard/diy_serviceCard"
     },
 	"enablePullDownRefresh": false
 }
 \ No newline at end of file
@@ -522,6 +522,10 @@
 			 <luckyGo object="{{item.content}}"></luckyGo>
 		</block>
+		<!-- 服务卡项 -->
+		<block wx:if="{{item.ename=='servicecategory'}}">
+			 <serviceCard object="{{item.content}}"></serviceCard>
+		</block>
     </view>
@@ -24,44 +24,84 @@ Page({
       wx.setNavigationBarTitle({
           title: '支付成功',
       });
-
+			this.setData({
+				options,
+			});
       var type=options.type,order_sn=options.order_sn;
       var th=this,order=null;
-      //如果是等1，就是单个订单的订单号
-      if(type==1){
-          await  getApp().request.promiseGet("/api/weshop/order/page",
-               {data:{store_id:e.globalData.setting.stoid,order_sn:order_sn}}).then(res=>{
-                   if(ut.ajax_ok(res)){
-                       order=res.data.data.pageData[0];
-                       th.setData({order:order,order_sn:order_sn})
-                   }
-
-          })
-      }else{
-          await  getApp().request.promiseGet("/api/weshop/order/page",
-              {data:{store_id:e.globalData.setting.stoid,parent_sn:order_sn}}).then(res=>{
-
-                  if(ut.ajax_ok(res)){
-                      var allmoney=0,user_money=0;
-                      for(var i in res.data.data.pageData){
-                          var item=res.data.data.pageData[i];
-                          allmoney+=item.order_amount;
-                          user_money += item.user_money?item.user_money:0;
-                      }
-                      order=res.data.data.pageData[0];
-                      th.setData({ order: order, type: 2, allmoney: allmoney, order_sn: order_sn, user_money: user_money})
-                  }
-
-
-          })
-      }
-      //--获取门店--
-      if(order.exp_type==1) {
-          await getApp().request.promiseGet("/api/weshop/pickup/get/"+ e.globalData.setting.stoid+"/"+order.pickup_id,
-              {1:1}).then(res => {
-              th.setData({pick:res.data.data})
-          });
-      }
+			
+			
+			// 卡项订单
+			if(options.card == 1) {
+				let url = '/api/weshop/recharge/user/page'
+				let data = {
+					store_id: getApp().globalData.setting.stoid,
+					user_id: getApp().globalData.userInfo.user_id,
+					order_id: this.data.options.order_id,
+				};
+				
+				// 请求数据
+				getApp().promiseGet(url, {
+					data: data,
+				}).then(res => {
+					if (res.data.code == 0) {
+						console.log('请求成功', res);
+						this.setData({
+							order: res.data.data.pageData[0],
+							order_sn: res.data.data.pageData[0].order_sn,
+						});
+					} else {
+						throw (res);
+					};
+				}).catch(err => {
+					wx.showToast({
+						title: err.data.data,
+						icon: 'error',
+					});
+				});
+			} else {
+				
+				//如果是等1，就是单个订单的订单号
+				if(type==1){
+				    await  getApp().request.promiseGet("/api/weshop/order/page",
+				         {data:{store_id:e.globalData.setting.stoid,order_sn:order_sn}}).then(res=>{
+				             if(ut.ajax_ok(res)){
+				                 order=res.data.data.pageData[0];
+				                 th.setData({order:order,order_sn:order_sn})
+				             }
+				
+				    })
+				}else{
+				    await  getApp().request.promiseGet("/api/weshop/order/page",
+				        {data:{store_id:e.globalData.setting.stoid,parent_sn:order_sn}}).then(res=>{
+				
+				            if(ut.ajax_ok(res)){
+				                var allmoney=0,user_money=0;
+				                for(var i in res.data.data.pageData){
+				                    var item=res.data.data.pageData[i];
+				                    allmoney+=item.order_amount;
+				                    user_money += item.user_money?item.user_money:0;
+				                }
+				                order=res.data.data.pageData[0];
+				                th.setData({ order: order, type: 2, allmoney: allmoney, order_sn: order_sn, user_money: user_money})
+				            }
+				
+				
+				    })
+				}
+				//--获取门店--
+				if(order.exp_type==1) {
+				    await getApp().request.promiseGet("/api/weshop/pickup/get/"+ e.globalData.setting.stoid+"/"+order.pickup_id,
+				        {1:1}).then(res => {
+				        th.setData({pick:res.data.data})
+				    });
+				};
+				
+				
+			};
+      
+			
+			
   },
   goto: function() {
@@ -25,25 +25,38 @@
       <view class="payitem flex">
         <view>实付金额 :</view>
         <!-- {{filters.toFix()}} -->
-        <view class="pay_money" wx:if="{{type==1}}">{{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money,2)}}元</view>
-        <view class="pay_money" wx:else>{{filters.toFix(allmoney+user_money,2) }}元</view>
+				<!-- 卡项订单 -->
+				<view class="pay_money" wx:if="{{options.card == 1}}">{{filters.toFix(order.account,2) }}元</view>
+				
+				<block wx:else>
+					<view class="pay_money" wx:if="{{type==1}}">{{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money,2)}}元</view>
+					<view class="pay_money" wx:else>{{filters.toFix(allmoney+user_money,2) }}元</view>
+				</block>
       </view>
       <!-- 支付方式 -->
-      <view class="payitem flex" wx:if="type==1">
-        <view>支付方式 :</view>
-        <view wx:if="{{order.order_amount>0 && order.user_money>0 }}">微信支付,余额支付</view>
-        <view wx:elif="{{order.order_amount>0}}">微信支付</view>
-        <view wx:elif="{{order.user_money>0}}">余额支付</view>
-        <view wx:else>免单</view>
-      </view>
-      <view class="payitem flex"  wx:else>
-          <view>支付方式 :</view>
-          <view wx:if="{{allmoney>0 && user_money>0 }}">微信支付,余额支付</view>
-          <view wx:elif="{{allmoney>0}}">微信支付</view>
-          <view wx:elif="{{user_money>0}}">余额支付</view>
-          <view wx:else>免单</view>
-      </view>
+			<view class="payitem flex" wx:if="{{options.card == 1}}">
+			  <view>支付方式 :</view>
+			  <view>微信支付</view>
+			</view>
+			
+			<block wx:else>
+				<view class="payitem flex" wx:if="{{type==1}}">
+				  <view>支付方式 :</view>
+				  <view wx:if="{{order.order_amount>0 && order.user_money>0 }}">微信支付,余额支付</view>
+				  <view wx:elif="{{order.order_amount>0}}">微信支付</view>
+				  <view wx:elif="{{order.user_money>0}}">余额支付</view>
+				  <view wx:else>免单</view>
+				</view>
+				<view class="payitem flex"  wx:else>
+				    <view>支付方式 :</view>
+				    <view wx:if="{{allmoney>0 && user_money>0 }}">微信支付,余额支付</view>
+				    <view wx:elif="{{allmoney>0}}">微信支付</view>
+				    <view wx:elif="{{user_money>0}}">余额支付</view>
+				    <view wx:else>免单</view>
+				</view>
+			</block>
+      
@@ -72,23 +85,42 @@
     <view class="pay_User fs28" wx:else>
       <view class="payitem flex">
         <view class="pay_Receiving">门店 :</view>
-        <view class="pay_name ellipsis-1">{{pick.pickup_name}}</view>
+				<view class="pay_name ellipsis-1" wx:if="{{options.card == 1}}">{{order.list[0].pickup_name}}</view>
+        <view class="pay_name ellipsis-1" wx:else>{{pick.pickup_name}}</view>
       </view>
       <view class="payitem flex">
         <view class="pay_Receiving">门店地址 :</view>
-        <view class="address ellipsis-2">{{pick.fulladdress}}</view>
+				<view class="pay_name" wx:if="{{options.card == 1}}">{{order.list[0].fulladdress}}</view>
+        <view class="address ellipsis-2" wx:else>{{pick.fulladdress}}</view>
       </view>
     </view>
     <!-- 链接 -->
-    <view class="fs32">
-      <view class="flex-center">
-        <navigator class="pay_order flex-center" url="/pages/user/order_list/order_list">
-          <view>查看订单</view>
-        </navigator>
-      </view>
-      <view class="flex-center">
-        <navigator class="pay_home flex-center" bindtap="goto">
+    <view class="fs28 pd20 mgt40">
+			<view class="flex">
+				
+				<block wx:if="{{options.card == 1}}">
+					<!-- <view class="flex-center"> -->
+					  <navigator class="btn f1 bg-yellow white" url="/packageA/pages/details_serviceCard/details_serviceCard?order_id={{order.order_id}}">
+					    <view>订单详情</view>
+					  </navigator>
+					<!-- </view> -->
+					<!-- <view class="flex-center"> -->
+					  <navigator class="btn f1 bg-red white mgl20" url="/pages/user/my_service/i_service">
+					    <view>立即预约</view>
+					  </navigator>
+					<!-- </view> -->
+				</block>
+				
+				<block wx:else>
+					<navigator class="btn f1 bg-yellow white" url="/pages/user/order_list/order_list">
+					  <view>查看订单</view>
+					</navigator>
+				</block>
+				
+			</view>
+      <view class="mgt30">
+        <navigator class="btn border c-6" bindtap="goto">
           <view>回到首页</view>
         </navigator>
       </view>
@@ -59,26 +59,38 @@ page {
 .pay_User .payitem .pay_name {
   margin-right: 38rpx;
-  max-width: 250rpx;
+  /* max-width: 250rpx; */
 }
-.pay_order {
-  margin-top: 115rpx;
-  color: rgb(104, 104, 104);
-  width: 560rpx;
-  height: 62rpx;
-  border-radius: 30rpx;
-  border: 3rpx solid rgb(209, 209, 209);
+.btn {
+	box-sizing: border-box;
+	height: 80rpx;
+	line-height: 80rpx;
+	/* padding: 10rpx; */
+	text-align: center;
+  border-radius: 40rpx;
 }
 .pay_home {
-  margin-top: 35rpx;
+  /* margin-top: 35rpx; */
   color: rgb(255, 255, 255);
-  width: 566rpx;
-  height: 68rpx;
+  /* width: 566rpx;
+  height: 68rpx; */
   border-radius: 30rpx;
   background-color: rgb(219, 27, 52);
 }
 .address{
   width: 470rpx;
-}
 \ No newline at end of file
+}
+
+.bg-red {
+	background-color: rgb(219, 27, 52);
+}
+
+.bg-yellow {
+	background-color: #feca53;
+}
+
+.border {
+	border: 2rpx solid #ccc;
+}
-.box{
+/* .box{
 	padding: 10px;
 	border-bottom: 10px solid #f5f5f5;
 	color: #000000;
@@ -44,5 +44,278 @@ position: relative;
 .sear_inp{width: 490rpx; background-color:#eaeaea; height: 80rpx; border-radius:5rpx; margin: 25rpx;}
 .sear_inp input{width: 400rpx;}
 .select{height: 80rpx; width: 220rpx;background-color:#eaeaea; margin:25rpx; font-size: 28rpx; line-height: 80rpx;text-align: center }
-.sear_btn{ width: 50rpx; height: 100%; display: flex; align-items: center;}
+.sear_btn{ width: 50rpx; height: 100%; display: flex; align-items: center;} */
+
+.border-bottom {
+	border-bottom: 2rpx solid #e0e0e0;
+}
+
+.fs22 {
+	font-size: 22rpx;
+}
+
+.flexShrink-0 {
+	flex-shrink: 0;
+}
+
+.pt16 {
+	padding-top: 16rpx;
+}
+
+.maxWidth-340 {
+	max-width: 340rpx;
+}
+
+.maxWidth-400 {
+	max-width: 400rpx;
+}
+
+
+/* 图标字体 */
+/* @font-face {
+  font-family: 'iconfont';
+  src: url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.eot');
+  src: url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.eot?#iefix') format('embedded-opentype'),
+  url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.woff2') format('woff2'),
+  url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.woff') format('woff'),
+  url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.ttf') format('truetype'),
+  url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.svg#iconfont') format('svg');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 28rpx;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-weizhi:before {
+  content: "\e615";
+	color: #FFBA10;
+}
+
+.icon-arrow_down:before {
+  content: "\e600";
+}
+
+.icon-arrow_right:before {
+  content: "\e61f";
+} */
+/* 图标字体 */
+
+
+
+.icon-weizhi {
+	color: #FFBA10;
+}
+
+page {
+	height: 100%;
+	font-size: 28rpx;
+}
+
+.container {
+	height: 100%;
+}
+#map {
+	/* width: 100%;
+	height: ; */
+	display: block;
+	width: 100%;
+	height: 100%;
+}
+.tab-container.active {
+	height: calc(100% - 86rpx);
+}
+.map-container.active ~ .tab-container .list-container {
+	height: 204rpx;
+	overflow: hidden;
+}
+.map-container.active ~ .tab-container .list {
+	overflow: hidden;
+}
+.tab-container.active .list-container {
+	height: calc(100% - 108rpx - 84rpx);
+	background-color: #F7F7F7;
+}
+
+
+.search-container {
+	display: flex;
+	align-items: center;
+	padding: 0 32rpx;
+	border-bottom: 2rpx solid #F0F0F0;
+}
+
+.city:after {
+	display: inline-block;
+	content: '◣';
+	font-size: 14rpx;
+	padding-left: 8rpx;
+	padding-right: 20rpx;
+	transform: rotateZ(-45deg);
+	position: relative;
+	top: -16rpx;
+}
+
+.input-container {
+	padding: 12rpx 0;
+	flex: 1;
+}
+
+.input {
+	padding: 0 20rpx;
+	height: 60rpx;
+	line-height: 60rpx;
+	border-radius: 30rpx;
+	background-color: #F3F3F3;
+}
+
+.placeholder {
+	color: #676767;
+	font-size: 24rpx;
+}
+
+
+
+
+
+/* 切换卡 */
+.tab-title-container {
+	display: flex;
+	text-align: center;
+	border-bottom: 20rpx solid #F7F7F7;
+}
+.tab-title {
+	width: 50%;
+	line-height: 88rpx;
+	position: relative;
+}
+.tab-title.active {
+	font-weight: bold;
+}
+.tab-title.active::after {
+	position: absolute;
+	content: '';
+	width: 110rpx;
+	height: 4rpx;
+	left: 50%;
+	bottom: 0;
+	transform: translateX(-50%);
+	background-color: #FFBA10;
+}
+
+.map-container {
+	transition: 0.1s all linear;
+	background-color: pink;
+}
+
+.map-container.active {
+	height: calc(100% - 86rpx - 80rpx - 200rpx);
+	transition: 0.1s all linear;
+}
+
+
+
+
+/* 查看地图 */
+.view-map {
+	line-height: 80rpx;
+	text-align: center;
+	font-size: 24rpx;
+	color: #000;
+	border-bottom: 2rpx solid #F0F0F0;
+}
+
+
+/* 列表 */
+.list {
+	height: 100%;
+}
+.list-item {
+	padding: 40rpx 28rpx;
+	border-bottom: 2rpx solid #F0F0F0;
+	justify-content: space-between;
+	background-color: #fff;
+}
+.list-item:last-child {
+	border-bottom: none;
+}
+radio .wx-radio-input {
+  width: 32rpx;
+  height: 32rpx;
+}
+radio .wx-radio-input.wx-radio-input-checked {
+	border-color: #333;
+	/* border-color: #FFBA10; */
+	background-color: white;
+}
+radio .wx-radio-input.wx-radio-input-checked::before {
+	display: inline-block;
+  content: ''; 
+  width: 24rpx;
+  height: 24rpx;
+  border-radius: 50%;
+	background-color: #333;
+  /* background-color: #FFBA10; */
+}
+.name-container {
+	padding-left: 14rpx;
+	padding-right: 30rpx;
+	box-sizing: border-box;
+}
+.name {
+	display: flex;
+	align-items: center;
+	font-size: 30rpx;
+	position: relative;
+}
+.address {
+	color: #6E6E6E;
+	font-size: 26rpx;
+	line-height: 34rpx;
+	padding-top: 16rpx;
+	/* padding-right: 40rpx; */
+	text-align: justify;
+}
+.tag {
+	color: #FF5B5A;
+	border-radius: 6rpx;
+	border: 2rpx solid #FF5B5A;
+	font-size: 22rpx;
+	padding: 0 4rpx;
+	flex-shrink: 0;
+	margin-left: 4rpx;
+}
+
+.distance {
+	color: #6E6E6E;
+	font-size: 22rpx;
+	line-height: 34rpx;
+	padding-top: 16rpx;
+	/* word-break: break-all; */
+}
+
+.icon-arrow_right {
+	padding-left: 20rpx;
+}
+
+.right {
+	min-width: 200rpx;
+	text-align: right;
+}
+
+.icon-arrow_down.active {
+	display: inline-block;
+	transform: rotateZ(180deg);
+}
+
+
+
+
+
+
+
+
@@ -85,10 +85,12 @@ Page({
 		var startDate=date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate(); 
-		if(t.index) {
+		if(t.index && t.tabindex) {
 			this.setData({
-				currentIndex: t.index
+				currentIndex: t.index,
+				tabIndex: t.tabindex,
 			});
+			this.clickTab();
 		};
 		this.setData({
@@ -144,7 +146,7 @@ Page({
 	},1)
     this.resetData(), this.requestOrderList(this.data.activeCategoryId);
-
+		this.clickTab();
   },
   changeTab: function(t) {
     if (this.data.activeCategoryId == t.currentTarget.id) return false;
@@ -2138,8 +2140,15 @@ Page({
 	// 点击卡项订单二级tabbar
 	clickTab(e) {
-		console.log('服务卡项index', e.target.dataset.index);
-		let currentIndex = e.target.dataset.index;
+		// console.log('服务卡项index', e.target.dataset.index);
+		let currentIndex = 0;
+		if(e) {
+			currentIndex = e.target.dataset.index;
+		} else {
+			currentIndex = this.data.tabIndex
+		};
+		
+		// let || this.data.tabIndex;
 		let url = '/api/weshop/recharge/user/page';
 		let data = {
@@ -4,7 +4,7 @@
 		<!-- 一级tabbar -->
 		<view class="tab-container" bindtap="onClickTab">
 			<view class="tab {{currentIndex == 0 ? 'active':''}}" data-index="0"><text class="iconfont icon-cloud"></text>线上订单</view>
-			<view class="tab {{currentIndex == 2 ? 'active':''}}" data-index="2" style="display: none;"><text class="iconfont icon-bankcard"></text>卡项订单</view>
+			<view class="tab {{currentIndex == 2 ? 'active':''}}" data-index="2"><text class="iconfont icon-bankcard"></text>卡项订单</view>
 			<view class="tab {{currentIndex == 1 ? 'active':''}}" data-index="1"><text class="iconfont icon-shop"></text>线下订单</view>
 		</view>
@@ -171,7 +171,18 @@ var filters = {
 	JSONStringify: function(val) {
 		return JSON.stringify(val);
-	}
+	},
+	
+	// 循环列表计算数量
+	count: function(list) {
+		var sum = 0;
+		if(list && list.length != 0) {
+			list.forEach(function(item) {
+				sum += item.qty;
+			});
+			return sum;
+		};
+	},
@@ -194,4 +205,5 @@ module.exports = {
 	price: filters.price,
 	div100: filters.div100,
 	JSONStringify: filters.JSONStringify,
+	count: filters.count,
 }
 \ No newline at end of file
@@ -2,6 +2,10 @@ var t = require(&quot;util.js&quot;);
 module.exports = {
     uniqueId: "",
+		// i: url
+		// e: method
+		// s: data
+		// a: header
     request: function(e, i, o) {
         var n = this, a = o.header ? o.header : {
           "content-type": "application/x-www-form-urlencoded"
@@ -39,7 +43,9 @@ module.exports = {
     uploadFile: function(t, e) {
         var i = this;
-        t = this.modifyUrl(t, e), console.log("app.request", t, e), e.isShowLoading = void 0 === e.isShowLoading || e.isShowLoading, 
+        t = this.modifyUrl(t, e), 
+				// console.log("app.request", t, e), 
+				e.isShowLoading = void 0 === e.isShowLoading || e.isShowLoading, 
         e.isShowLoading && this.showLoading(), wx.uploadFile(Object.assign({}, e, {
             url: t,
             filePath: e.filePath,