Merge branch 'test' into 'qa'

Test See merge request !686

Merge branch 'test' into 'qa'
Test See merge request !686
后端研发-苏明海
2 parents 7b859edb a620c3ee
Showing 16 changed files with 243 additions and 73 deletions
app.wxss
packageB/pages/luckactivity/index/g_filter.wxs
packageB/pages/luckactivity/index/index.js
packageB/pages/luckactivity/index/index.wxml
packageB/pages/luckactivity/index/index.wxss
packageB/pages/luckactivity/luckinfo/luckinfo.js
packageB/pages/luckactivity/luckinfo/luckinfo.wxml
packageB/pages/luckactivity/luckinfo/luckinfo.wxss
packageB/pages/user/collect_list/collect_list.wxml
packageB/pages/user/comment/comment.js
packageB/pages/user/comment/comment.wxml
pages/cart/cart/cart.js
pages/cart/cart/cart.wxml
pages/user/order_list/order_list.js
pages/user/order_list/order_list.wxml
utils/weapp-icon.wxss
@@ -16,6 +16,12 @@
 .pdt20 {
 	padding-top: 20rpx;
 }
+.pdt30 {
+	padding-top: 30rpx;
+}
+.pdt40 {
+	padding-top: 40rpx;
+}
 .pdb0 {
 	padding-bottom: 0 !important;
 }
@@ -299,10 +305,18 @@ button {
 .t-c {
     text-align: center;
 }
+.img-block {
+	width: 100%;
+	height: 100%;
+	display: block;
+}
 .ai_and{
   align-items: flex-end;
 }
+.ai_end{
+  align-items: flex-end;
+}
 .cover-layer {
     position: fixed;
     left: 0;
@@ -613,7 +627,7 @@ background: #ffe3e2;
     font-size: 22rpx;
 }
 .fs24{
-    font-size: 24rpx;
+    font-size: 24rpx !important;
 }
 .fs26{
@@ -652,12 +666,12 @@ background: #ffe3e2;
   align-items: flex-end;
 }
 .fs45{
-    font-size: 45rpx;
+    font-size: 45rpx !important;
 }
 .fs50{
-    font-size: 50rpx;
+    font-size: 50rpx !important;
 }
-.fs60{ font-size:60rpx;}
+.fs60{ font-size:60rpx !important;}
 .fs80 {font-size: 80rpx;}
 .flex-wrap,
 .wrap {
@@ -689,9 +703,9 @@ background: #ffe3e2;
 /* 图标字体(ty) */
 @font-face {
   font-family: 'iconfont';  /* Project id 2054717 */
-  src: url('//at.alicdn.com/t/font_2054717_l5nx11noek8.woff2?t=1626055955086') format('woff2'),
-       url('//at.alicdn.com/t/font_2054717_l5nx11noek8.woff?t=1626055955086') format('woff'),
-       url('//at.alicdn.com/t/font_2054717_l5nx11noek8.ttf?t=1626055955086') format('truetype');
+  src: url('//at.alicdn.com/t/font_2054717_nzwl8grylfi.woff2?t=1627287108388') format('woff2'),
+       url('//at.alicdn.com/t/font_2054717_nzwl8grylfi.woff?t=1627287108388') format('woff'),
+       url('//at.alicdn.com/t/font_2054717_nzwl8grylfi.ttf?t=1627287108388') format('truetype');
 }
 .iconfont {
@@ -702,6 +716,20 @@ background: #ffe3e2;
   -moz-osx-font-smoothing: grayscale;
 }
+.icon-guan:before {
+  content: "\e612";
+}
+
+.icon-gouwuche:before {
+  content: "\e617";
+}
+
+.icon-zhuanfa:before {
+  content: "\e611";
+}
+
+
+
 .icon-zhuanpan:before {
   content: "\e642";
 }
@@ -20,10 +20,27 @@ var g_filters = {
             var tnow=getDate();
             if(t1>=tnow) return 1;
             return 0;
-	}
+	},
+	btnText: function(userlbtype) {
+		switch(userlbtype) {
+			case 1: {
+				return '去兑换';
+			};
+			case 2: {
+				return '已兑换';
+			};
+			case 3: {
+				return '已到期';
+			};
+			case 4: {
+				return '查看';
+			};
+		};
+	},
 }
 module.exports = {
 	has_char: g_filters.has_char,
 	beg_time: g_filters.beg_time,
 	end_time: g_filters.end_time,
+	btnText: g_filters.btnText, 
 }
 \ No newline at end of file
@@ -23,6 +23,7 @@ Page({
 		let url = '/api/weshop/marketing/marketingLuckForm/page';
 		let data = {
 			store_id: app.globalData.setting.stoid,
+			user_id: app.globalData.userInfo.user_id,
 		};
 		this.setData({
@@ -79,6 +80,7 @@ Page({
 				let url = '/api/weshop/marketing/marketingLuckForm/page';
 				let data = {
 					store_id: app.globalData.setting.stoid,
+					user_id: app.globalData.userInfo.user_id,
 					is_end: 0,
 				};
@@ -19,11 +19,14 @@
 		<block wx:for="{{list.pageData}}">
 			<view class="tab-item" bindtap="goto" data-id="{{item.id}}" data-title="{{item.act_name}}">
-				<text class="iconfont icon-zhuanpan"></text>
+				<view class="img-container">
+					<image wx:if="{{item.imageurl}}" src="{{item.imageurl}}" class="img"></image>
+					<text class="iconfont icon-zhuanpan" wx:else></text>
+				</view>
 				<view class="desc-container">
 					<view class="">
 						<!-- 标题 -->
-						<view class="ellipsis-1x taj">{{item.act_name}}</view>
+						<view class="ellipsis-1x taj fs28">{{item.act_name}}</view>
 						<!-- 时间 -->
 						<view class="date pdt10 pdb20" wx:if="{{currentIndex == 0}}">活动时间：{{filter.format_time(item.begindate) + ' 至 ' + filter.format_time(item.enddate)}}</view>
 						<view class="date pdt10 pdb20" wx:else>兑换时间：{{filter.format_time(item.begindate) + ' 至 ' + filter.format_time(item.enddate)}}</view>
@@ -31,7 +34,7 @@
 					<!-- 按钮 -->
 					<view class="btn-container">
 						<view class="btn red" wx:if="{{currentIndex == 0}}">立即参与</view>
-						<view class="btn red" wx:else>去兑换</view>
+						<view class="btn {{item.userlbtype == 1 ? 'red':'gray'}}" wx:else>{{g_filter.btnText(item.userlbtype)}}</view>
 					</view>
 				</view>
 			</view>
@@ -104,25 +104,28 @@ page {
 .img-container {
 	/* background-color: #dedede; */
 	/* height: 300rpx; */
-	width: 100%;
-	height: 200rpx;
+	width: 160rpx;
+	height: 160rpx;
+	line-height: 160rpx;
+	text-align: center;
 }
 .img-container2 {
-	width: 200rpx;
+	/* width: 200rpx;
 	height: 200rpx;
 	background-color: #dedede;
 	margin-right: 20rpx;
 	flex-shrink: 0;
 	display: flex;
 	align-items: center;
-	position: relative;
+	justify-content: center;
+	position: relative; */
 }
 .img-container2.error::before {
-	font-family: iconfont;
+	/* font-family: iconfont;
 	position: absolute;
-	content: '\e8c1';
+	content: '\e8c1'; */
 }
 .img {
@@ -178,4 +181,9 @@ page {
 	color: #bbb;
 	text-align: center;
 	font-size: 22rpx;
+}
+
+.btn.gray {
+	background-color: #aaa;
+	color: white;
 }
 \ No newline at end of file
+var WxParse = require('../../../../utils/wxParse/wxParse.js');
 const app = getApp();
 let imghost = app.globalData.setting.imghost;
 let self = null;
@@ -10,6 +11,7 @@ Page({
 		noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
 		pageNum: 1, // 当前页数
 		imghost: imghost,
+		num: 3,
     prizes: [],
 		defaultConfig: {
@@ -55,14 +57,14 @@ Page({
   },
 	onLoad(options) {
-		console.log('imghost+++++', imghost);
+		// console.log('imghost+++++', imghost);
 		self = this;
 		this.data.options = options;
 		// this.setData({
 		// 	options,
 		// 	imghost,
 		// });
-		console.log('this data', this.data.imghost);
+		// console.log('this data', this.data.imghost);
 		wx.setNavigationBarTitle({
 			title: options.title,
 		});
@@ -96,6 +98,7 @@ Page({
 							self.setData({
 								luckInfo: res.data.data,
 							});
+							WxParse.wxParse('content', 'html', self.data.luckInfo.remark, self);
 						} else {
 							wx.showToast({
 								title: res.data.msg,
@@ -195,7 +198,17 @@ Page({
 	// 设置转盘奖品布局
 	prizeLayout(award) {
 		let prizes = [];
-		let length = award.length;
+		// let length = award.length;
+		if(award) {
+			var length = award.length;
+		} else {
+			wx.showToast({
+				title: '请设置奖品',
+				icon: 'none',
+			});
+			return;
+		};
+		
 		let thx = {fonts: [{ text: '谢谢\n参与', top: '18%', wordWrap:false, fontColor: 'rgba(255,255,255,.6)'}]};
 		if(length == 1) {
@@ -441,7 +454,7 @@ Page({
 				results.push(pos);//找到就存储索引
 			};
-			pos+=1;//并从下个位置开始搜索
+			pos += 1;//并从下个位置开始搜索
 	    // if(pos === -1){//未找到就退出循环完成搜索
 	    //   break;
 	    // };
@@ -462,7 +475,15 @@ Page({
 			return;
 		};
-		if(this.data.luckInfo.user_LuckNumDay != 0) {
+		if(this.data.luckInfo.msgInfo) {
+			wx.showToast({
+				title: this.data.luckInfo.msgInfo,
+				icon: 'none',
+			});
+			return;
+		};
+		
+		if(this.data.luckInfo.user_LuckNumDay > 0 || this.data.luckInfo.vip_act_num == 0) {
 			// console.log('start choujiang');
 			// let start = false;
 			if(!this.data.start) {
@@ -484,8 +505,16 @@ Page({
 						if(res.data.code == 0) {
 							console.log('开始摇奖', res.data.data);
+							if(self.data.luckInfo.vip_act_num != 0) {
+								self.setData({
+									'luckInfo.user_LuckNumDay': self.data.luckInfo.user_LuckNumDay - 1,
+									// isActive: true,
+								});
+							};
+							
 							self.setData({
-								'luckInfo.user_LuckNumDay': self.data.luckInfo.user_LuckNumDay - 1
+								// 'luckInfo.user_LuckNumDay': self.data.luckInfo.user_LuckNumDay - 1,
+								isActive: true,
 							});
 							// console.log('请求成功', res.data.data);
 							let luckyId = res.data.data.id;
@@ -502,8 +531,34 @@ Page({
 							}, 3000);
+							//获取兑奖记录
+							// app.request.get('/api/weshop/marketing/marketingLuckRecord/page', {
+							// 	isShowLoading: false,
+							// 	data: {
+							// 		store_id: app.globalData.setting.stoid,
+							// 		user_id: app.globalData.userInfo.user_id,
+							// 		luck_formid: self.data.options.id,
+							// 		luck_state: 1
+							// 	},
+							// 	success: function(res) {
+							// 		if(res.data.code == 0) {
+							// 			// console.log('res===>', res.data.data.pageData);
+							// 			self.setData({
+							// 				record: res.data.data.pageData,
+							// 			});
+							// 		};
+							// 	},	
+							// });
+							
+							
 						} else {
 							// console.log('请求出错');
+							if(self.data.luckInfo.vip_act_num != 0) {
+								self.setData({
+									'luckInfo.user_LuckNumDay': self.data.luckInfo.user_LuckNumDay - 1,
+								});
+							};
+							
 							let thxIndexArr = self.data.thxIndexArr;
 							const random = Math.random() * thxIndexArr.length >> 0;
 							const index = thxIndexArr[random];
@@ -516,8 +571,12 @@ Page({
 						};
 					},
-					fail: function() {
+					fail: function(res) {
 						// console.log('出错');
+						wx.showToast({
+							title: '数据请求失败',
+							icon: 'error',
+						});
 						let thxIndexArr = self.data.thxIndexArr;
 						const random = Math.random() * thxIndexArr.length >> 0;
 						const index = thxIndexArr[random];
@@ -543,6 +602,7 @@ Page({
   end (event) {
     // 中奖奖品详情
     // console.log('zjiangla~~',event.detail.lbtype);
+		let no_luck_urltype = this.data.luckInfo.no_luck_urltype;
 		let lbtype;
 		let resultTitle = event.detail.fonts[0].text.replace('\n','');
 		if(event.detail.lbtype == 5) {
@@ -551,12 +611,45 @@ Page({
 			lbtype = -1;
 		};
 		this.setData({
+			num: 3,
 			hiddenCanvas: true,
 			showResult: true,
 			showMask: true,
 			resultTitle,
 			currentLbtype: lbtype,
 		});
+		
+		let num = this.data.num;
+		let timer = setInterval(function() {
+			if(num == 0) {
+				clearInterval();
+			} else {
+				self.setData({
+					num: --num, 
+				});
+			}
+		}, 1000);
+		
+		
+		if(no_luck_urltype == 1) {
+			if(this.data.luckInfo.no_luck_weappurl) {
+				// console.log('dfjsoafjoasfjds======>',this.data.luckInfo.no_luck_weappurl);
+				let num = this.data.num;
+				let url = this.data.luckInfo.no_luck_weappurl;
+				self.timer = setInterval(function() {
+					if(num == 0) {
+						clearInterval();
+						app.goto(url);
+					} else {
+						self.setData({
+							num: --num, 
+						});
+					}
+				}, 1000);
+				
+			};
+		};
+		
   },
 	showPopup() {
@@ -570,39 +663,23 @@ Page({
 			user_id: app.globalData.userInfo.user_id,
 			luck_formid: this.data.options.id,
 			luck_state: 1,
-			pageSize: 50,
 		}).then(function(res) {
 			self.setData({
 				showPopup: true,
 				showMask: true,
 				hiddenCanvas: true,
-				// record: self.data.list.pageData,
 			});
 		});
-		// app.request.get('/api/weshop/marketing/marketingLuckRecord/page', {
-		// 	// isShowLoading: false,
-		// 	data: {
-		// 		store_id: app.globalData.setting.stoid,
-		// 		user_id: app.globalData.userInfo.user_id,
-		// 		luck_formid: this.data.options.id,
-		// 		luck_state: 1
-		// 	},
-		// 	success: function(res) {
-		// 		// console.log('中奖记录', res.data.data);
-		// 		if(res.data.code == 0) {
-		// 			self.setData({
-		// 				showPopup: true,
-		// 				showMask: true,
-		// 				hiddenCanvas: true,
-		// 				record: self.data.list.pageData,
-		// 			});
-					
-					
-		// 		};
-		// 	},
-			
+		
+		// this.setData({
+		// 	showPopup: true,
+		// 	showMask: true,
+		// 	hiddenCanvas: true,
+		// 	'list.pageData': this.data.record,
+		// 	// record: self.data.list.pageData,
 		// });
+		
 	},
 	closePopup() {
@@ -613,8 +690,13 @@ Page({
 		});
 	},
+	/**
+	 * 关闭中奖结果
+	 */
 	closeResult() {
+		clearInterval(this.timer);
 		this.setData({
+			num: 3,
 			showResult: false,
 			showMask: false,
 			hiddenCanvas: false,
@@ -627,7 +709,6 @@ Page({
 			user_id: app.globalData.userInfo.user_id,
 			luck_formid: this.data.options.id,
 			luck_state: 1,
-			pageSize: 50,
 		});
 	},
@@ -36,27 +36,27 @@
 				hiddenCanvas="{{hiddenCanvas}}"
 			/>
 		</view>
-		
-		<view class="fs28 white t-c pdt10">今天你还有 <text class="fs50 c-yellow">{{filter.show_default(luckInfo.user_LuckNumDay, '0')}}</text> 次抽奖机会</view>
+		<view class="fs28 white t-c pdt10" wx:if="{{luckInfo.vip_act_num == 0}}">今天你有 <text class="fs50 c-yellow">不限次</text> 抽奖机会</view>
+		<view class="fs28 white t-c pdt10" wx:else>今天你还有 <text class="fs50 c-yellow">{{filter.show_default(luckInfo.user_LuckNumDay, '0')}}</text> 次抽奖机会</view>
 		<view class="tip-to-down expand-transition">
 			<text></text>
 			<text></text>
 		</view>
 	</view>
 	<!-- 奖品展示 -->
-	<view>
+	<view wx:if="{{award}}">
 		<view class="badge-container"><image src="{{imghost + 'miniapp/images/luckDraw/badge.png'}}" class="badge prizes" lazy-load></image></view>
 		<view class="list br12 bg-white">
 			<view class="list-item" wx:for="{{award}}">
 				<view class="img-container">
-					<image wx:if="{{item.luck_goods_img}}" src="{{item.luck_goods_img}}" class="img" mode="aspectFit"></image>
+					<image wx:if="{{item.luck_goods_img}}" src="{{imghost + item.luck_goods_img}}" class="img" mode="aspectFit"></image>
 					<image src="{{imghost + tool.showDefaultImg(item.lbtype)}}" class="img" mode="aspectFit" wx:else></image>
 				</view>
 				<view class="item-r">
 					<view class="fs28">{{item.luck_goods_name}}</view>
 					<view class="flex jc_sb fs26 c9">
 						<view>价值：<text class="rmb">{{item.luck_goods_price}}</text></view>
-						<view>数量：{{item.luck_goods_qty}}</view>
+						<view>数量：{{item.num}}</view>
 					</view>
 				</view>
 			</view>
@@ -65,8 +65,10 @@
 	<!-- 活动展示 -->
 	<view wx:if="{{luckInfo.remark}}">
 		<view class="badge-container"><image src="{{imghost + 'miniapp/images/luckDraw/badge.png'}}" class="badge activity" lazy-load></image></view>
-		<view class="bg-white br12 pd20">
-			{{luckInfo.remark}}
+		<view class="bg-white br12 pd20 fs28">
+			<!-- {{luckInfo.remark}} -->
+			<import src="../../../../utils/wxParse/wxParse.wxml"/>
+			<template is="wxParse" data="{{wxParseData:content.nodes}}"/>
 			<!-- 时间 -->
 			<!-- <view class="bdb">
 				<view class="">
@@ -126,23 +128,24 @@
 </view>
 <!-- 悬浮按钮 -->
-<view class="gift-container {{record && record.length != 0 ? 'active':''}}" bindtap="showPopup"><text class="iconfont icon-liwu"></text></view>
+<view class="gift-container {{((record && record.length != 0) || isActive) ? 'active':''}}" bindtap="showPopup"><text class="iconfont icon-liwu"></text></view>
 <!-- 弹窗 -->
 <view class="popup-container" wx:if="{{showPopup}}">
 	<scroll-view class="popup-list" scroll-y bindscrolltolower="loadmore">
 		<view class="popup-item" wx:for="{{list.pageData}}">
 				<view class="img-container">
-					<image wx:if="{{item.luck_goods_img}}" src="{{item.luck_goods_img}}" class="img" mode="aspectFit"></image>
+					<image wx:if="{{item.luck_goods_img}}" src="{{imghost + item.luck_goods_img}}" class="img" mode="aspectFit"></image>
 					<image wx:else src="{{imghost + tool.showDefaultImg(item.luck_type)}}" class="img" mode="aspectFit"></image>
 				</view>
 				<view class="flex fdc f1">	
-					<view class="ellipsis-2">{{item.luck_name}}</view>
+					<view class="ellipsis-2 fs28">{{item.luck_name}}</view>
 					<view class="pdt20">
 						<view class="fs26 xc-black3">价值：<text class="rmb">{{item.luck_goods_price}}</text></view>
-						<view class="flex ai_c jc_sb fs26 xc-black3 ">
-							<view style="visibility: {{item.luck_type == 5 ? 'visible':'hidden'}};">兑换状态：{{item.state == 0 ? '未兑换':'已兑换'}}</view>
-							<view class="btn" bindtap="{{item.luck_type == 5 ? (item.state == 0 ? 'showQr':''):'goto'}}" data-type="{{item.luck_type}}" data-id="{{item.id}}">{{((item.luck_type == 5)&&(item.state == 1)) ? '已兑换':'兑换'}}</view>
+						<view class="flex ai_c jc_fe fs26 xc-black3 ">
+							<!-- <view style="visibility: {{item.luck_type == 5 ? 'visible':'hidden'}};">兑换状态：{{item.state == 0 ? '未兑换':'已兑换'}}</view> -->
+							<!-- <view style="">兑换状态：{{item.state == 0 ? '未兑换':'已兑换'}}</view> -->
+							<view class="btn" bindtap="{{item.luck_type == 5 ? (item.state == 0 ? 'showQr':''):'goto'}}" data-type="{{item.luck_type}}" data-id="{{item.id}}">{{item.luck_type == 5 ? (item.state == 1 ? '已兑换':'兑换'):'查看'}}</view>
 						</view>
 					</view>
 				</view>
@@ -159,15 +162,18 @@
 	<view class="popup">
 		<view class="t-c">
 			<block wx:if="{{resultTitle == '谢谢参与'}}">
-				<view class="bold c-tb fs40">{{resultTitle}}</view>
-				<view class="pdt10">继续加油噢~</view>
+				<view class="bold c-tb fs40">{{luckInfo.no_luck_name}}</view>
+				<view class="pdt10">{{luckInfo.no_luck_remark}}</view>
+				<view class="img-container2"><image src="{{imghost + (luckInfo.no_luck_img ? luckInfo.no_luck_img:'miniapp/images/luckDraw/gift.png')}}" class="img" mode="aspectFit"></image></view>
+				<view class="pdt40 fs26 c9">{{num}}s后自动跳转...</view>
 			</block>
 			<block wx:else>
 				<view class="bold c-tb fs40">恭喜你获得</view>
 				<view class="pdt10">{{resultTitle}} </view>
+				<view class="img-container2"><image src="{{imghost + 'miniapp/images/luckDraw/gift.png'}}" class="img" mode="aspectFit"></image></view>
 			</block>
 		</view>
-		<view class="img-container2"><image src="{{imghost + 'miniapp/images/luckDraw/gift.png'}}" class="img"></image></view>
+		
 		<view class="pdt40" wx:if="{{currentLbtype == 5}}">
 			<view class="btn btn2" bindtap="clickReceive">立即领取</view>
 		</view>
@@ -68,7 +68,7 @@ page,
 	width: 140rpx;
 	height: 140rpx;
 	margin-right: 20rpx;
-	/* background-color: gray; */
+	background-color: #f5f5f5;
 }
 .img {
@@ -5,7 +5,7 @@
   </view>
   <view class="flex-level fs30 xc-ash">当前暂无收藏</view>
   <view class="flex-level">
-    <navigator url="/pages/index/index/index" bindtap="goto">
+    <navigator bindtap="go_to" data-url="/pages/index/index/index" bindtap="goto">
       <view class="flex-center fs28 white">去首页逛逛</view>
     </navigator>
   </view>
@@ -154,5 +154,9 @@ Page({
       url: '/pages/index/index/index',
     })
   },
+   go_url(e){
+        var url=e.currentTarget.dataset.url;
+        getApp().goto(url);
+    }
 });
 \ No newline at end of file
@@ -14,7 +14,7 @@
     </view>
     <view class="flex-level fs30 xc-ash">当前暂无评价</view>
     <view class="flex-level">
-      <navigator url="/pages/index/index/index" bindtap="goto">
+      <navigator bindtap="go_url" data-url="/pages/index/index/index">
         <view class="flex-center fs28 white">去首页逛逛</view>
       </navigator>
     </view>
@@ -2066,5 +2066,10 @@ Page({
 	  if (hei< viewHeight) {
 	      this.setData({ max_sw_height: viewHeight });
 	   }
-	}
+	},
+
+    go_url(e){
+        var url=e.currentTarget.dataset.url;
+        getApp().goto(url);
+    }
 });
 \ No newline at end of file
@@ -252,7 +252,7 @@
   </view>
   <view class="flex-level fs32 xc-ash">购物车竟然是空的</view>
   <view class="flex-level">
-    <navigator url="/pages/index/index/index" bindtap="goto">
+    <navigator bindtap="go_url" data-url="/pages/index/index/index" bindtap="goto">
       <view class="flex-center fs30 white">去首页逛逛</view>
     </navigator>
   </view>
@@ -1575,7 +1575,12 @@ Page({
 			icon: 'none',
 			duration: 3000
 		})
-	}
+	},
+
+    go_url(e){
+       var url=e.currentTarget.dataset.url;
+       getApp().goto(url);
+    }
 });
 \ No newline at end of file
@@ -249,7 +249,7 @@
   </view>
   <view class="flex-level fs30 xc-ash">当前暂无订单</view>
   <view class="flex-level">
-    <navigator url="/pages/index/index/index" bindtap="goto">
+    <navigator bindtap="go_url" data-url="/pages/index/index/index" >
       <view class="flex-center fs28 white">去首页逛逛</view>
     </navigator>
   </view>
-
 .t-icon {
     display: inline-block;
     width: 16px; 
@@ -10,6 +9,18 @@
+.t-icon-gowudai {
+    background: url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20width%3D%27100%25%27%20height%3D%27100%25%27%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20id%3D%22t-icon-gowudai%22%20viewBox%3D%220%200%201024%201024%22%3E%3Cpath%20d%3D%22M150.72-1.06666667l-5.86666667%20169.49333334%20738.13333334%2016.53333333L870.4-1.06666667z%22%20fill%3D%22%23cdcdcd%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M150.72-1.06666667l72.64%2049.38666667-78.50666667%20106.56z%22%20fill%3D%22%23A2A2A2%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M120.64%201025.70666667L69.33333333%20969.49333333h884.37333334l-54.29333334%2056.21333334z%22%20fill%3D%22%23bfbfbf%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M223.36%2047.36l-20.37333333%20113.38666667-103.57333334-8.74666667z%22%20fill%3D%22%23AEADAD%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M870.4-1.06666667l-71.68%2049.38666667%2084.26666667%20108.48z%22%20fill%3D%22%23A2A2A2%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M798.72%2048.32l20.37333333%20112.42666667%20105.49333334-8.74666667z%22%20fill%3D%22%23AEADAD%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M99.41333333%20152h825.17333334L954.66666667%20969.49333333H69.33333333z%22%20fill%3D%22%23dbdbdb%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M718.82666667%20256.10666667H770.13333333v255.68c0%20141.22666667-114.45333333%20255.68-255.68%20255.68S258.66666667%20653.01333333%20258.66666667%20511.78666667V256.10666667h51.30666666v255.68c0%20112.85333333%2091.52%20204.37333333%20204.37333334%20204.37333333s204.37333333-91.52%20204.37333333-204.37333333V256.10666667z%22%20fill%3D%22%23A5A5A5%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M718.82666667%20312.32H770.13333333v149.12c0%20141.22666667-114.45333333%20255.68-255.68%20255.68S258.66666667%20602.66666667%20258.66666667%20461.44V312.32h51.30666666v149.12c0%20112.85333333%2091.52%20204.37333333%20204.37333334%20204.37333333s204.37333333-91.52%20204.37333333-204.37333333V312.32z%22%20fill%3D%22%23FFFFFF%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E);
+}
+
+/* .t-icon-liwu {
+    background: url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20width%3D%27100%25%27%20height%3D%27100%25%27%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20id%3D%22t-icon-liwu%22%20viewBox%3D%220%200%201024%201024%22%3E%3Cpath%20d%3D%22M85.93%20950.016c0%2024.576%207.126%2031.317%2029.44%2031.317h353.366V511.744H85.931v438.272z%20m469.334%2031.317h353.365c22.358%200%2029.44-6.698%2029.44-31.317V511.744H555.221v469.59zM938.667%20256H725.333c51.499-11.733%20105.899-49.707%20112.598-94.293%207.85-50.859-52.566-127.958-125.654-118.187-87.424%2012.117-151.509%2089.259-196.736%20149.077C470.656%20133.931%20412.16%2065.408%20328.363%2045.483c-81.152-19.2-136.747%2064.938-135.254%20116.992%201.451%2044.245%2052.608%2081.834%20105.558%2093.525H85.333c-26.368%200-42.666%2014.848-42.666%2042.667v170.581l426.666%200.085V256h85.334v213.333l426.666-0.085V298.667c0-27.819-16.341-42.667-42.666-42.667z%20m-687.019-77.824c-14.763-16.427-4.779-38.741%204.48-55.595%2017.024-29.696%2040.747-47.744%2081.152-30.933%2056.32%2023.51%2097.792%2073.216%20131.584%20117.803-71.552%207.893-178.304%2010.965-217.216-31.275z%20m311.296%2030.507c34.816-44.63%2075.221-89.942%20131.157-117.803%2058.582-28.97%20113.024%2049.323%2085.206%2086.912-21.419%2028.544-89.259%2031.232-125.91%2032.853-30.08%201.536-60.501%200.811-90.453-1.962z%22%20fill%3D%22%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E);
+}
+
+.t-icon-echarts {
+    background: url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20width%3D%27100%25%27%20height%3D%27100%25%27%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20id%3D%22t-icon-echarts%22%20viewBox%3D%220%200%201024%201024%22%3E%3Cpath%20d%3D%22M436.59925293%20533.33333333c0-65.04312613%2035.34952507-123.72333775%2088.37381267-153.41693881l-206.44122641-353.49525068c-282.79620057%20159.07286282-376.82593725%20518.22403753-217.75307443%20801.02023808l359.15117471-206.44122642c-11.31184801-22.62369604-23.33068654-52.31729711-23.33068654-87.66682217z%22%20fill%3D%22%23DADADA%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M613.34687829%20356.58570799c65.04312613%200%20123.72333775%2035.34952507%20153.41693879%2088.37381266l253.1025995-147.05402428C890.48715482%2073.78950741%20602.03503025-2.56546674%20377.91904132%20126.81379502l147.05402428%20253.1025995c24.03767705-11.31184801%2059.38720211-23.33068654%2088.37381269-23.33068653z%22%20fill%3D%22%23EBEBEB%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M701.72069095%20686.75027214c-23.33068654%2017.67476253-58.68021163%2023.33068654-88.37381266%2023.33068653-65.04312613%200-123.72333775-35.34952507-153.41693882-88.37381266L201.17141596%20775.12408481c41.00544908%2070.69905013%20100.3926512%20129.37926176%20171.09170135%20171.09170134%20153.41693881%2088.37381268%20335.82048816%2082.71788866%20477.21858844-5.65592402l-147.7610148-253.80958999z%22%20fill%3D%22%23B8B8B8%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M920.18075589%20356.58570799L766.76381708%20444.95952065c12.01883853%2029.69360106%2023.33068654%2058.68021163%2023.33068654%2088.37381268%200%2065.04312613-35.34952507%20123.72333775-88.37381267%20153.41693881l88.37381267%20153.41693881c171.09170134-100.3926512%20229.77191295-312.48980161%20130.08625227-483.58150296z%22%20fill%3D%22%23C7C7C7%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E);
+} */
+
 .t-icon-sort-up {
     background: url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20width%3D%27100%25%27%20height%3D%27100%25%27%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20id%3D%22t-icon-sort-up%22%20viewBox%3D%220%200%201024%201024%22%3E%3Cpath%20d%3D%22M-109.37837037-109.37837037h1242.75674074v1242.75674074H-109.37837037z%22%20fill%3D%22%23FFFFFF%22%20fill-opacity%3D%220%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M242.7360391%20615.56306132h538.5279218a20.71261275%2020.71261275%200%200%201%2016.57008947%2033.14018016l-269.2639609%20359.05313542a20.71261275%2020.71261275%200%200%201-33.14017894%200L226.16594963%20648.70324148A20.71261275%2020.71261275%200%200%201%20242.7360391%20615.56306132z%22%20fill%3D%22%23C7C7C7%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M528.57008947%2016.2436231l269.2639609%20359.05313542A20.71261275%2020.71261275%200%200%201%20781.2639609%20408.43693868H242.7360391a20.71261275%2020.71261275%200%200%201-16.57008947-33.14018016l269.2639609-359.05313542a20.71261275%2020.71261275%200%200%201%2033.14017894%200z%22%20fill%3D%22%235A5A5A%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E);
 }