1.删除聊天页面

4 years ago · feaa0a26aa
parent db04d97f8c
commit feaa0a26aa
345 changed files with 878 additions and 3420 deletions
--- a/copy.json
+++ b/copy.json
@ -0,0 +1,300 @@
+{
+	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+
+		{
+			"path": "pages/tabBar/home/home",
+			"style": {
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh": true,
+				"onReachBottomDistance": 50,
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
+					"softinputNavBar": "none",
+					"subNVues": [{
+						"id": "homeTitleNvue", // 唯一标识  
+						"path": "pages/tabBar/home/subNvue/homeTitleNvue", // 页面路径  
+						"type": "navigationBar"
+					}]
+				}
+			}
+		},
+		{
+			"path": "pages/goods/store-list/store-list",
+			"style": {
+				"navigationBarTitleText": "门店列表",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/tabBar/category/category",
+			"style": {
+				"navigationBarTextStyle": "black",
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
+					"bounce": "none"
+
+				}
+			}
+		},
+		{
+			"path": "pages/tabBar/cart/cart",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTextStyle": "black",
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
+					"softinputNavBar": "none",
+					"subNVues": [{
+						"id": "cartTitleNvue", // 唯一标识  
+						"path": "pages/tabBar/cart/subNvue/cartTitleNvue", // 页面路径  
+						"type": "navigationBar"
+					}]
+				}
+			}
+		},
+		{
+			"path": "pages/tabBar/user/user",
+			"style": {
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#f06c7a",
+				"backgroundColorTop": "#f06c7a",
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
+					"subNVues": [{
+						"id": "userTitleNvue", // 唯一标识  
+						"path": "pages/tabBar/user/subNvue/userTitleNvue", // 页面路径  
+						"type": "navigationBar"
+					}]
+				}
+			}
+		},
+		{
+			"path": "pages/goods/goods-list/goods-list",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": true,
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/goods/HM-search/HM-search",
+			"style": {
+				"navigationBarTitleText": "搜索",
+				"app-plus": {
+					"softinputNavBar": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/goods/goods",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationBarBackgroundColor": "#f1f1f1",
+				"onReachBottomDistance": 50,
+				"h5": {
+					"titleNView": false
+				},
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
+					"bounce": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText": "登录",
+				"navigationBarBackgroundColor": "#f06c7a",
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"bounce": "none", //关闭窗口回弹效果
+					"softinputNavBar": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/login/register",
+			"style": {
+				"navigationBarTitleText": "注册账号",
+				"navigationBarBackgroundColor": "#f06c7a",
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"bounce": "none", //关闭窗口回弹效果
+					"softinputNavBar": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/login/resetpasswd",
+			"style": {
+				"navigationBarTitleText": "重置密码",
+				"navigationBarBackgroundColor": "#f06c7a",
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"bounce": "none", //关闭窗口回弹效果
+					"softinputNavBar": "none"
+				}
+			}
+		}, {
+			"path": "pages/order/confirmation",
+			"style": {
+				"navigationBarTitleText": "确认订单",
+				"softinputNavBar": "none"
+			}
+		}, {
+			"path": "pages/user/order_list/order_list",
+			"style": {
+				"navigationBarTitleText": "我的订单",
+				"navigationBarBackgroundColor": "#f8f8f8",
+				"backgroundColorTop": "#f3f3f3",
+				"backgroundColorBottom": "#ffffff"
+			}
+		}, {
+			"path": "pages/user/setting/setting",
+			"style": {
+				"navigationBarBackgroundColor": "#f8f8f8",
+				"navigationBarTitleText": "我的设置",
+				"backgroundColorTop": "#ffffff",
+				"backgroundColorBottom": "#f3f3f3"
+			}
+		}, {
+			"path": "pages/user/myQR/myQR",
+			"style": {
+				"navigationBarTitleText": "我的二维码",
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
+		}, {
+			"path": "pages/user/coupon/coupon",
+			"style": {
+				"navigationBarTitleText": "优惠券",
+				"navigationBarBackgroundColor": "#f06c7a",
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
+		}, {
+			"path": "pages/user/keep/keep",
+			"style": {
+				"navigationBarTitleText": "我的收藏",
+				"navigationBarBackgroundColor": "#f06c7a",
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
+		}, {
+			"path": "pages/user/address/address",
+			"style": {
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTitleText": "地址管理",
+				"backgroundColorTop": "#ffffff",
+				"backgroundColorBottom": "#ffffff"
+			}
+		}, {
+			"path": "pages/user/address/edit/edit",
+			"style": {
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTitleText": "编辑收件人地址",
+				"backgroundColorTop": "#ffffff",
+				"backgroundColorBottom": "#ffffff"
+			}
+		}, {
+			"path": "pages/user/deposit/deposit",
+			"style": {
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTitleText": "充值",
+				"backgroundColorTop": "#ffffff",
+				"backgroundColorBottom": "#ffffff"
+			}
+		}, {
+			"path": "pages/pay/payment/payment",
+			"style": {
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTitleText": "订单支付",
+				"backgroundColorTop": "#ffffff",
+				"backgroundColorBottom": "#ffffff"
+			}
+		}, {
+			"path": "pages/pay/success/success",
+			"style": {
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTitleText": "支付成功",
+				"backgroundColorTop": "#ffffff",
+				"backgroundColorBottom": "#ffffff"
+			}
+		}, {
+			"path": "pages/goods/ratings/ratings",
+			"style": {
+				"navigationBarTitleText": "商品评论",
+				"enablePullDownRefresh": true,
+				"onReachBottomDistance": 50,
+				"backgroundColorTop": "#ffffff",
+				"backgroundColorBottom": "#ffffff"
+			}
+		},
+		{
+			"path": "pages/goods/store-list/store-details",
+			"style": {
+				"navigationBarTitleText": "门店详情",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/goods/coupon-details/coupon-details",
+			"style": {
+				"navigationBarTitleText": "卡券详情",
+				"enablePullDownRefresh": false
+			}
+
+		}
+	],
+
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "",
+		"navigationBarBackgroundColor": "#ffffff",
+		"backgroundColor": "#ffffff",
+		"backgroundColorTop": "#ffffff",
+		"backgroundColorBottom": "#ffffff"
+	},
+	"tabBar": {
+		"color": "#333333",
+		"selectedColor": "#f06c7a",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
+		"list": [{
+				"pagePath": "pages/tabBar/home/home",
+				"iconPath": "static/img/tabBar/home.png",
+				"selectedIconPath": "static/img/tabBar/home-on.png",
+				"text": "首页"
+			},
+			{
+				"pagePath": "pages/tabBar/category/category",
+				"iconPath": "static/img/tabBar/category.png",
+				"selectedIconPath": "static/img/tabBar/category-on.png",
+				"text": "分类"
+			},
+			{
+				"pagePath": "pages/tabBar/cart/cart",
+				"iconPath": "static/img/tabBar/cart.png",
+				"selectedIconPath": "static/img/tabBar/cart-on.png",
+				"text": "购物车"
+			},
+			{
+				"pagePath": "pages/tabBar/user/user",
+				"iconPath": "static/img/tabBar/user.png",
+				"selectedIconPath": "static/img/tabBar/user-on.png",
+				"text": "我的"
+			}
+		]
+	}
+}
--- a/pages.json
+++ b/pages.json
@ -178,17 +178,6 @@
 				"navigationBarBackgroundColor":"#f06c7a",
 				"navigationBarTextStyle":"white"
 			}
-		}, {
-			"path": "pages/msg/chat/chat",
-			"style": {
-				"navigationBarBackgroundColor": "#f2f2f2",
-				"backgroundColorTop": "#e5e5e5",
-				"backgroundColorBottom": "#e5e5e5",
-				"app-plus": {
-					"softinputNavBar": "none",
-					"bounce": "none"
-				}
-			}
        },{
 			"path": "pages/user/coupon/coupon",
 			"style": {
--- a/pages/goods/coupon-details/coupon-details.vue
+++ b/pages/goods/coupon-details/coupon-details.vue
@ -36,7 +36,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="width90 mart60" style="height: 80px;">
+		<view class="width90 mart20" style="height: 80px;">
 			<view class="coupon-des flleft">
 				立即<br>前往
 			</view>
--- a/pages/goods/goods.vue
+++ b/pages/goods/goods.vue
@ -282,9 +282,9 @@ export default {
 		},
 		// 客服
 		toChat(){
-			uni.navigateTo({
-				url:"../msg/chat/chat?name=客服008"
-			})
+			// uni.navigateTo({
+			// 	url:"../msg/chat/chat?name=客服008"
+			// })
 		},
 		// 分享
 		share(){
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
--- a/pages/msg/chat/chat.vue
+++ b/pages/msg/chat/chat.vue
@ -1,782 +0,0 @@
-<template>
-	<view>
-		<view class="content" @touchstart="hideEmoji">
-			<scroll-view class="msg-list" scroll-y="true" :scroll-with-animation="scrollAnimation" :scroll-top="scrollTop" :scroll-into-view="scrollToView">
-				<view class="row" v-for="(row,index) in msgList" :key="index" :id="'msg'+row.id">
-					<!-- 自己发出的消息 -->
-					<view class="my" v-if="row.uid==myuid">
-						<view class="left">
-							<view v-if="row.type=='text'" class="bubble">
-								<rich-text :nodes="row.msg.content"></rich-text>
-							</view>
-							<view v-if="row.type=='voice'" class="bubble voice" @tap="playVoice(row)" :class="playMsgid == row.id?'play':''">
-								<view class="length">{{row.msg.length}}</view>
-								<view class="icon my-voice"></view>
-							</view>
-							<view v-if="row.type=='img'" class="bubble img" @tap="showPic(row)">
-								<image :src="row.msg.url" :style="{'width': row.msg.w+'px','height': row.msg.h+'px'}"></image>
-							</view>
-						</view>
-						<view class="right">
-							<image :src="row.face"></image>
-						</view>
-					</view>
-					<!-- 别人发出的消息 -->
-					<view class="other" v-if="row.uid!=myuid">
-						<view class="left">
-							<image :src="row.face"></image>
-						</view>
-						<view class="right">
-							<view class="username">
-								<view class="name">{{row.username}}</view> <view class="time">{{row.time}}</view>
-							</view>
-							<view v-if="row.type=='text'" class="bubble">
-								<rich-text :nodes="row.msg.content"></rich-text>
-							</view>
-							<view v-if="row.type=='voice'" class="bubble voice" @tap="playVoice(row)" :class="playMsgid == row.id?'play':''">
-								<view class="icon other-voice"></view>
-								<view class="length">{{row.msg.length}}</view>
-							</view>
-							<view v-if="row.type=='img'" class="bubble img" @tap="showPic(row)">
-								<image :src="row.msg.url" :style="{'width': row.msg.w+'px','height': row.msg.h+'px'}"></image>
-							</view>
-						</view>
-					</view>
-				</view>
-			</scroll-view>
-		</view>
-		<!-- 表情栏 -->
-		<view class="emoji-box" :class="showEmji" @touchmove.stop.prevent="discard">
-			<swiper class="swiper" indicator-dots="true" duration="150">
-				<swiper-item v-for="(page,pid) in emojiList" :key="pid">
-					<view v-for="(em,eid) in page" :key="eid" @tap="addEmoji(em)">
-						<image mode="widthFix" :src="'/static/img/emoji/'+em.url"></image>
-					</view>
-				</swiper-item>
-			</swiper>
-		</view>
-		<!-- 底部输入栏 -->
-		<view class="input-box" :class="showEmji" @touchmove.stop.prevent="discard">
-			<!-- H5下不能录音，输入栏布局改动一下 -->
-			<!-- #ifndef H5 -->
-			<view class="voice">
-				<view class="icon" :class="isVoice?'jianpan':'yuyin'" @tap="switchVoice"></view>
-			</view>
-			<!-- #endif -->
-			<!-- #ifdef H5 -->
-			<view class="more" @tap="chooseImage">
-				<view class="icon tupian"></view>
-			</view>
-			<!-- #endif -->
-			<view class="textbox">
-				<view class="voice-mode" :class="[isVoice?'':'hidden',recording?'recording':'']" @touchstart="voiceBegin" @touchmove.stop.prevent="voiceIng" @touchend="voiceEnd" @touchcancel="voiceCancel">{{voiceTis}}</view>
-				<view class="text-mode"  :class="isVoice?'hidden':''">
-					<view class="box">
-						<textarea auto-height="true" v-model="textMsg" id="textMsg" />
-					</view>
-					<view class="em" @tap="chooseEmoji">
-						<view class="icon biaoqing"></view>
-					</view>
-				</view>
-			</view>
-			<!-- #ifndef H5 -->
-			<view class="more" @tap="chooseImage">
-				<view class="icon tupian"></view>
-			</view>
-			<!-- #endif -->
-			<label for="textMsg">
-			<view class="send" :class="isVoice?'hidden':''" @tap="sendText">
-				<view class="btn">
-					发送
-				</view>
-			</view>
-			</label>
-		</view>
-		<!-- 录音效果(上滑取消) -->
-		<view class="record" :class="recording?'':'hidden'">
-			<view class="ing" :class="willStop?'hidden':''"><view class="icon luyin2" ></view></view>
-			<view class="cancel" :class="willStop?'':'hidden'"><view class="icon chehui" ></view></view>
-			<view class="tis" :class="willStop?'change':''">{{recordTis}}</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				//文字消息
-				
-				textMsg:'',
-				//消息列表
-				scrollAnimation:false,
-				scrollTop:0,
-				scrollToView:'',
-				msgList:[],
-				msgImgList:[],
-				myuid:0,
-				//录音相关参数
-				// #ifndef H5
-				//H5不能录音
-				RECORDER:uni.getRecorderManager(),
-				// #endif
-				isVoice:false,
-				voiceTis:'按住 说话',
-				recordTis:"手指上滑 取消发送",
-				recording:false,
-				willStop:false,
-				initPoint:{identifier:0,Y:0},
-				recordTimer:null,
-				recordLength:0,
-				//播放语音相关参数
-				AUDIO:uni.createInnerAudioContext(),
-				playMsgid:null,
-				VoiceTimer:null,
-				//表情定义
-				showEmji:'',
-				emojiList:[
-					[{"url":"100.gif",alt:"[微笑]"},{"url":"101.gif",alt:"[伤心]"},{"url":"102.gif",alt:"[美女]"},{"url":"103.gif",alt:"[发呆]"},{"url":"104.gif",alt:"[墨镜]"},{"url":"105.gif",alt:"[哭]"},{"url":"106.gif",alt:"[羞]"},{"url":"107.gif",alt:"[哑]"},{"url":"108.gif",alt:"[睡]"},{"url":"109.gif",alt:"[哭]"},{"url":"110.gif",alt:"[囧]"},{"url":"111.gif",alt:"[怒]"},{"url":"112.gif",alt:"[调皮]"},{"url":"113.gif",alt:"[笑]"},{"url":"114.gif",alt:"[惊讶]"},{"url":"115.gif",alt:"[难过]"},{"url":"116.gif",alt:"[酷]"},{"url":"117.gif",alt:"[汗]"},{"url":"118.gif",alt:"[抓狂]"},{"url":"119.gif",alt:"[吐]"},{"url":"120.gif",alt:"[笑]"},{"url":"121.gif",alt:"[快乐]"},{"url":"122.gif",alt:"[奇]"},{"url":"123.gif",alt:"[傲]"}],
-					[{"url":"124.gif",alt:"[饿]"},{"url":"125.gif",alt:"[累]"},{"url":"126.gif",alt:"[吓]"},{"url":"127.gif",alt:"[汗]"},{"url":"128.gif",alt:"[高兴]"},{"url":"129.gif",alt:"[闲]"},{"url":"130.gif",alt:"[努力]"},{"url":"131.gif",alt:"[骂]"},{"url":"132.gif",alt:"[疑问]"},{"url":"133.gif",alt:"[秘密]"},{"url":"134.gif",alt:"[乱]"},{"url":"135.gif",alt:"[疯]"},{"url":"136.gif",alt:"[哀]"},{"url":"137.gif",alt:"[鬼]"},{"url":"138.gif",alt:"[打击]"},{"url":"139.gif",alt:"[bye]"},{"url":"140.gif",alt:"[汗]"},{"url":"141.gif",alt:"[抠]"},{"url":"142.gif",alt:"[鼓掌]"},{"url":"143.gif",alt:"[糟糕]"},{"url":"144.gif",alt:"[恶搞]"},{"url":"145.gif",alt:"[什么]"},{"url":"146.gif",alt:"[什么]"},{"url":"147.gif",alt:"[累]"}],
-					[{"url":"148.gif",alt:"[看]"},{"url":"149.gif",alt:"[难过]"},{"url":"150.gif",alt:"[难过]"},{"url":"151.gif",alt:"[坏]"},{"url":"152.gif",alt:"[亲]"},{"url":"153.gif",alt:"[吓]"},{"url":"154.gif",alt:"[可怜]"},{"url":"155.gif",alt:"[刀]"},{"url":"156.gif",alt:"[水果]"},{"url":"157.gif",alt:"[酒]"},{"url":"158.gif",alt:"[篮球]"},{"url":"159.gif",alt:"[乒乓]"},{"url":"160.gif",alt:"[咖啡]"},{"url":"161.gif",alt:"[美食]"},{"url":"162.gif",alt:"[动物]"},{"url":"163.gif",alt:"[鲜花]"},{"url":"164.gif",alt:"[枯]"},{"url":"165.gif",alt:"[唇]"},{"url":"166.gif",alt:"[爱]"},{"url":"167.gif",alt:"[分手]"},{"url":"168.gif",alt:"[生日]"},{"url":"169.gif",alt:"[电]"},{"url":"170.gif",alt:"[炸弹]"},{"url":"171.gif",alt:"[刀子]"}],
-					[{"url":"172.gif",alt:"[足球]"},{"url":"173.gif",alt:"[瓢虫]"},{"url":"174.gif",alt:"[翔]"},{"url":"175.gif",alt:"[月亮]"},{"url":"176.gif",alt:"[太阳]"},{"url":"177.gif",alt:"[礼物]"},{"url":"178.gif",alt:"[抱抱]"},{"url":"179.gif",alt:"[拇指]"},{"url":"180.gif",alt:"[贬低]"},{"url":"181.gif",alt:"[握手]"},{"url":"182.gif",alt:"[剪刀手]"},{"url":"183.gif",alt:"[抱拳]"},{"url":"184.gif",alt:"[勾引]"},{"url":"185.gif",alt:"[拳头]"},{"url":"186.gif",alt:"[小拇指]"},{"url":"187.gif",alt:"[拇指八]"},{"url":"188.gif",alt:"[食指]"},{"url":"189.gif",alt:"[ok]"},{"url":"190.gif",alt:"[情侣]"},{"url":"191.gif",alt:"[爱心]"},{"url":"192.gif",alt:"[蹦哒]"},{"url":"193.gif",alt:"[颤抖]"},{"url":"194.gif",alt:"[怄气]"},{"url":"195.gif",alt:"[跳舞]"}],
-					[{"url":"196.gif",alt:"[发呆]"},{"url":"197.gif",alt:"[背着]"},{"url":"198.gif",alt:"[伸手]"},{"url":"199.gif",alt:"[耍帅]"},{"url":"200.png",alt:"[微笑]"},{"url":"201.png",alt:"[生病]"},{"url":"202.png",alt:"[哭泣]"},{"url":"203.png",alt:"[吐舌]"},{"url":"204.png",alt:"[迷糊]"},{"url":"205.png",alt:"[瞪眼]"},{"url":"206.png",alt:"[恐怖]"},{"url":"207.png",alt:"[忧愁]"},{"url":"208.png",alt:"[眨眉]"},{"url":"209.png",alt:"[闭眼]"},{"url":"210.png",alt:"[鄙视]"},{"url":"211.png",alt:"[阴暗]"},{"url":"212.png",alt:"[小鬼]"},{"url":"213.png",alt:"[礼物]"},{"url":"214.png",alt:"[拜佛]"},{"url":"215.png",alt:"[力量]"},{"url":"216.png",alt:"[金钱]"},{"url":"217.png",alt:"[蛋糕]"},{"url":"218.png",alt:"[彩带]"},{"url":"219.png",alt:"[礼物]"},]				
-				],
-				//表情图片图床名称
-				onlineEmoji:{"100.gif":"AbNQgA.gif","101.gif":"AbN3ut.gif","102.gif":"AbNM3d.gif","103.gif":"AbN8DP.gif","104.gif":"AbNljI.gif","105.gif":"AbNtUS.gif","106.gif":"AbNGHf.gif","107.gif":"AbNYE8.gif","108.gif":"AbNaCQ.gif","109.gif":"AbNN4g.gif","110.gif":"AbN0vn.gif","111.gif":"AbNd3j.gif","112.gif":"AbNsbV.gif","113.gif":"AbNwgs.gif","114.gif":"AbNrD0.gif","115.gif":"AbNDuq.gif","116.gif":"AbNg5F.gif","117.gif":"AbN6ET.gif","118.gif":"AbNcUU.gif","119.gif":"AbNRC4.gif","120.gif":"AbNhvR.gif","121.gif":"AbNf29.gif","122.gif":"AbNW8J.gif","123.gif":"AbNob6.gif","124.gif":"AbN5K1.gif","125.gif":"AbNHUO.gif","126.gif":"AbNIDx.gif","127.gif":"AbN7VK.gif","128.gif":"AbNb5D.gif","129.gif":"AbNX2d.gif","130.gif":"AbNLPe.gif","131.gif":"AbNjxA.gif","132.gif":"AbNO8H.gif","133.gif":"AbNxKI.gif","134.gif":"AbNzrt.gif","135.gif":"AbU9Vf.gif","136.gif":"AbUSqP.gif","137.gif":"AbUCa8.gif","138.gif":"AbUkGQ.gif","139.gif":"AbUFPg.gif","140.gif":"AbUPIS.gif","141.gif":"AbUZMn.gif","142.gif":"AbUExs.gif","143.gif":"AbUA2j.gif","144.gif":"AbUMIU.gif","145.gif":"AbUerq.gif","146.gif":"AbUKaT.gif","147.gif":"AbUmq0.gif","148.gif":"AbUuZV.gif","149.gif":"AbUliF.gif","150.gif":"AbU1G4.gif","151.gif":"AbU8z9.gif","152.gif":"AbU3RJ.gif","153.gif":"AbUYs1.gif","154.gif":"AbUJMR.gif","155.gif":"AbUadK.gif","156.gif":"AbUtqx.gif","157.gif":"AbUUZ6.gif","158.gif":"AbUBJe.gif","159.gif":"AbUdIO.gif","160.gif":"AbU0iD.gif","161.gif":"AbUrzd.gif","162.gif":"AbUDRH.gif","163.gif":"AbUyQA.gif","164.gif":"AbUWo8.gif","165.gif":"AbU6sI.gif","166.gif":"AbU2eP.gif","167.gif":"AbUcLt.gif","168.gif":"AbU4Jg.gif","169.gif":"AbURdf.gif","170.gif":"AbUhFS.gif","171.gif":"AbU5WQ.gif","172.gif":"AbULwV.gif","173.gif":"AbUIzj.gif","174.gif":"AbUTQs.gif","175.gif":"AbU7yn.gif","176.gif":"AbUqe0.gif","177.gif":"AbUHLq.gif","178.gif":"AbUOoT.gif","179.gif":"AbUvYF.gif","180.gif":"AbUjFU.gif","181.gif":"AbaSSJ.gif","182.gif":"AbUxW4.gif","183.gif":"AbaCO1.gif","184.gif":"Abapl9.gif","185.gif":"Aba9yR.gif","186.gif":"AbaFw6.gif","187.gif":"Abaiex.gif","188.gif":"AbakTK.gif","189.gif":"AbaZfe.png","190.gif":"AbaEFO.gif","191.gif":"AbaVYD.gif","192.gif":"AbamSH.gif","193.gif":"AbaKOI.gif","194.gif":"Abanld.gif","195.gif":"Abau6A.gif","196.gif":"AbaQmt.gif","197.gif":"Abal0P.gif","198.gif":"AbatpQ.gif","199.gif":"Aba1Tf.gif","200.png":"Aba8k8.png","201.png":"AbaGtS.png","202.png":"AbaJfg.png","203.png":"AbaNlj.png","204.png":"Abawmq.png","205.png":"AbaU6s.png","206.png":"AbaaXn.png","207.png":"Aba000.png","208.png":"AbarkT.png","209.png":"AbastU.png","210.png":"AbaB7V.png","211.png":"Abafn1.png","212.png":"Abacp4.png","213.png":"AbayhF.png","214.png":"Abag1J.png","215.png":"Aba2c9.png","216.png":"AbaRXR.png","217.png":"Aba476.png","218.png":"Abah0x.png","219.png":"Abdg58.png"}
-			};
-		},
-		onLoad(option) {
-			uni.setNavigationBarTitle({
-				title: option.name
-			});
-			this.getMsgList();
-			//语音自然播放结束
-			this.AUDIO.onEnded((res)=>{
-				this.playMsgid=null;
-			});
-			// #ifndef H5
-			//录音开始事件
-			this.RECORDER.onStart((e)=>{
-				this.recordBegin(e);
-			})
-			//录音结束事件
-			this.RECORDER.onStop((e)=>{
-				this.recordEnd(e);
-			})
-			// #endif
-		},
-		methods:{
-			getMsgList(){
-				// 消息列表
-				let list = [
-					{id:0,uid:0,username:"大黑哥",face:"/static/img/face.jpg",time:"12:56",type:"text",msg:{content:"为什么温度会相差那么大？"}},
-					{id:1,uid:1,username:"售后客服008",face:"/static/img/im/face/face_2.jpg",time:"12:57",type:"text",msg:{content:"这个是有偏差的，两个温度相差十几二十度是很正常的，如果相差五十度，那即是质量问题了。"}},
-					{id:2,uid:1,username:"售后客服008",face:"/static/img/im/face/face_2.jpg",time:"12:59",type:"voice",msg:{url:"/static/voice/3.aac",length:"00:06"}},
-					{id:3,uid:0,username:"大黑哥",face:"/static/img/face.jpg",time:"13:05",type:"voice",msg:{url:"/static/voice/2.mp3",length:"00:06"}},
-					{id:4,uid:0,username:"大黑哥",face:"/static/img/face.jpg",time:"13:05",type:"img",msg:{url:"/static/img/goods/p10.jpg",w:200,h:200}},
-					{id:5,uid:1,username:"售后客服008",face:"/static/img/im/face/face_2.jpg",time:"12:59",type:"img",msg:{url:"/static/img/q.jpg",w:1920,h:1080}}
-				]
-				// 获取消息中的图片,并处理显示尺寸
-				for(let i=0;i<list.length;i++){
-					if(list[i].type=='img'){
-						list[i] = this.setPicSize(list[i]);
-						console.log("list[i]: " + JSON.stringify(list[i]));
-						this.msgImgList.push(list[i].msg.url);
-					}
-				}
-				this.msgList = list;
-				// 滚动到底部
-				this.$nextTick(function() {
-					this.scrollTop = 9999;
-					this.scrollAnimation = true;
-				});
-			},
-			//处理图片尺寸，如果不处理宽高，新进入页面加载图片时候会闪
-			setPicSize(row){
-				let maxW = uni.upx2px(350);
-				let maxH = uni.upx2px(350);
-				if(row.msg.w>maxW||row.msg.h>maxH){
-					let scale = row.msg.w/row.msg.h;
-					if(row.msg.w>row.msg.h){
-						row.msg.w = maxW;
-						row.msg.h = row.msg.w/scale
-					}else{
-						row.msg.h = maxH;
-						row.msg.w = row.msg.h*scale;
-					}
-				}
-				return row;
-			},
-			// 接受消息(筛选处理)
-			screenMsg(msg){
-				//从长连接处转发给这个方法，进行筛选处理
-				if(msg.uid!=this.myuid){
-					uni.vibrateLong();
-				}
-				switch (msg.type){
-					case 'text':
-						this.addTextMsg(msg);
-						break;
-					case 'voice':
-						this.addVoiceMsg(msg);
-						break;
-					case 'img':
-						this.addImgMsg(msg);
-						break;
-				}
-				this.$nextTick(function() {
-					this.scrollToView = 'msg'+msg.id
-				});
-			},
-			// 选择表情
-			chooseEmoji(){
-				this.showEmji = this.showEmji=='showEmoji'?'hideEmoji':'showEmoji';
-			},
-			// 隐藏表情
-			hideEmoji(){
-				this.showEmji = this.showEmji=='showEmoji'?'hideEmoji':'';
-			},
-			//添加表情
-			addEmoji(em){
-				this.textMsg+=em.alt;
-			},
-			// 发送文字消息
-			sendText(){
-				this.hideEmoji();
-				if(!this.textMsg){
-					return;
-				}
-				let content = this.replaceEmoji(this.textMsg);
-				let msg = {content:content}
-				this.sendMsg(msg,'text');
-				this.textMsg = '';
-			},
-			//替换表情符号为图片
-			replaceEmoji(str){
-				let replacedStr = str.replace(/\[([^(\]|\[)]*)\]/g,(item, index)=>{
-					console.log("item: " + item);
-					for(let i=0;i<this.emojiList.length;i++){
-						let row = this.emojiList[i];
-						for(let j=0;j<row.length;j++){
-							let EM = row[j];
-							if(EM.alt==item){
-								//在线表情路径，图文混排必须使用网络路径
-								let onlinePath = 'https://s2.ax1x.com/2019/04/12/'
-								let imgstr = '<img src="'+onlinePath+this.onlineEmoji[EM.url]+'">';
-								console.log("imgstr: " + imgstr);
-								return imgstr;
-							}
-						}
-					}
-				});
-				return '<div style="display: flex;align-items: center;">'+replacedStr+'</div>';
-			},
-			// 选择图片发送
-			chooseImage(){
-				this.hideEmoji();
-				uni.chooseImage({
-					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-					success: (res)=>{
-						for(let i=0;i<res.tempFilePaths.length;i++){
-							uni.getImageInfo({
-								src: res.tempFilePaths[i],
-								success: (image)=>{
-									console.log(image.width);
-									console.log(image.height);
-									let msg = {url:res.tempFilePaths[i],w:image.width,h:image.height};
-									this.sendMsg(msg,'img');
-								}
-							});
-						}
-					}
-				});
-			},
-			// 发送消息
-			sendMsg(content,type){
-				//实际应用中，此处应该提交长连接，模板仅做本地处理。
-				var nowDate = new Date();
-				let lastid = this.msgList[this.msgList.length-1].id;
-				lastid++;
-				let msg = {id:lastid,uid:0,username:"大黑哥",face:"/static/img/face.jpg",time:nowDate.getHours()+":"+nowDate.getMinutes(),type:type,msg:content};
-				this.screenMsg(msg);
-				// 定时器模拟对方回复,三秒
-				setTimeout(()=>{
-					lastid = this.msgList[this.msgList.length-1].id;
-					lastid++;
-					msg = {id:lastid,uid:1,username:"售后客服008",face:"/static/img/im/face/face_2.jpg",time:nowDate.getHours()+":"+nowDate.getMinutes(),type:type,msg:content};
-					this.screenMsg(msg);
-				},3000)
-			},
-			
-			// 处理文字消息
-			addTextMsg(msg){
-				this.msgList.push(msg);
-			},
-			// 处理语音消息
-			addVoiceMsg(msg){
-				this.msgList.push(msg);
-			},
-			// 处理图片消息
-			addImgMsg(msg){
-				msg = this.setPicSize(msg);
-				this.msgImgList.push(msg.msg.url);
-				this.msgList.push(msg);
-			},
-			// 预览图片
-			showPic(row){
-				uni.previewImage({
-					indicator:"none",
-					current:row.msg.url,
-					urls: this.msgImgList
-				});
-			},
-			// 播放语音
-			playVoice(msg){
-				this.playMsgid=msg.id;
-				this.AUDIO.src = msg.msg.url;
-				console.log("msg.msg.url: " + msg.msg.url);
-                this.AUDIO.play();
-			},
-			// 录音开始
-			voiceBegin(e){
-				if(e.touches.length>1){
-					return ;
-				}
-				this.initPoint.Y = e.touches[0].clientY;
-				this.initPoint.identifier = e.touches[0].identifier;
-				this.RECORDER.start({format:"aac"});//录音开始,
-			},
-			//录音开始UI效果
-			recordBegin(e){
-				this.recording = true;
-				this.voiceTis='松开 结束';
-				this.recordLength = 0;
-				this.recordTimer = setInterval(()=>{
-					this.recordLength++;
-				},1000)
-			},
-			// 录音被打断
-			voiceCancel(){
-				this.recording = false;
-				this.voiceTis='按住 说话';
-				this.recordTis = '手指上滑 取消发送'
-				this.willStop = true;//不发送录音
-				this.RECORDER.stop();//录音结束
-			},
-			// 录音中(判断是否触发上滑取消发送)
-			voiceIng(e){
-				if(!this.recording){
-					return;
-				}
-				let touche = e.touches[0];
-				//上滑一个导航栏的高度触发上滑取消发送
-				if(this.initPoint.Y - touche.clientY>=uni.upx2px(100)){
-					this.willStop = true;
-					this.recordTis = '松开手指 取消发送'
-				}else{
-					this.willStop = false;
-					this.recordTis = '手指上滑 取消发送'
-				}
-			},
-			// 结束录音
-			voiceEnd(e){
-				if(!this.recording){
-					return;
-				}
-				this.recording = false;
-				this.voiceTis='按住 说话';
-				this.recordTis = '手指上滑 取消发送'
-				this.RECORDER.stop();//录音结束
-			},
-			
-			//录音结束(回调文件)
-			recordEnd(e){
-				clearInterval(this.recordTimer);
-				if(!this.willStop){
-					plus.io.resolveLocalFileSystemURL( e.tempFilePath, function( entry ) {
-						// 可通过entry对象操作test.html文件 
-						entry.file( function(file){
-							console.log(file.size + '--' + file.name);
-						} );
-					}, function ( e ) {
-						alert( "Resolve file URL failed: " + e.message );
-					} );
-					console.log("e: " + JSON.stringify(e));
-					let msg = {
-						length:0,
-						url:e.tempFilePath
-					}
-					let min = parseInt(this.recordLength/60);
-					let sec = this.recordLength%60;
-					min = min<10?'0'+min:min;
-					sec = sec<10?'0'+sec:sec;
-					msg.length = min+':'+sec;
-					this.sendMsg(msg,'voice');
-				}else{
-					console.log('取消发送录音');
-				}
-				this.willStop = false;
-			},
-			// 切换语音/文字输入
-			switchVoice(){
-				this.hideEmoji();
-				this.isVoice = this.isVoice?false:true;
-			},
-			discard(){
-				return;
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-page{
-	background-color: #e5e5e5;
-}
-
-	.icon {
-		font-size:56upx;
-		color: #333;
-	}
-.hidden{
-	display: none !important;
-}
-@keyframes showEM {
-	0% {transform: translateY(0);}
-	100% {transform: translateY(-42vw);}
-}
-@keyframes hideEM {
-	0% {transform: translateY(-42vw);}
-	100% {transform: translateY(0);}
-}
-.emoji-box{
-	&.hideEmoji{animation: hideEM .15s linear both;}
-	&.showEmoji{animation: showEM .15s linear both;}
-	width: 96%;
-	height: 42vw;
-	padding: 20upx 2%;
-	background-color: #f3f3f3;
-	border-top: solid 1upx #ddd;
-	position: fixed;
-	z-index: 20;
-	top: 100%;
-	.swiper{
-		swiper-item{
-			display: flex;
-			flex-wrap: wrap;
-			view{
-				width: 12vw;
-				height: 12vw;
-				display: flex;
-				justify-content: center;
-				image{
-					width: 60%;
-				}
-			}
-		}
-	}
-}
-.input-box{
-	&.hideEmoji{animation: hideEM .15s linear both;}
-	&.showEmoji{animation: showEM .15s linear both;}
-	width: 98%;
-	min-height: 100upx;
-	padding: 0 1%;
-	background-color: #f2f2f2;
-	display: flex;
-	position: fixed;
-	z-index: 20;
-	bottom: 0;
-	.voice,.more{
-		flex-shrink: 0;
-		width: 90upx;
-		height: 100upx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-	.send{
-		//H5发送按钮左边距
-		/* #ifdef H5 */
-		margin-left: 20upx;
-		/* #endif */
-		flex-shrink: 0;
-		width: 100upx;
-		height: 100upx;
-		display: flex;
-		align-items: center;
-		.btn{
-			width: 90upx;
-			height: 56upx;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			background:linear-gradient(to right,#f09b37,#eb632c);
-			color: #fff;
-			border-radius: 6upx;
-			font-size: 24upx;
-		}
-	}
-	.textbox{
-		width: 100%;
-		min-height: 70upx;
-		margin-top: 15upx;
-		.voice-mode{
-			width: calc(100% - 2upx);
-			height: 68upx;
-			border-radius: 70upx;
-			border:solid 1upx #cdcdcd;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			font-size: 28upx;
-			background-color: #fff;
-			color: #555;
-			&.recording{
-				background-color: #e5e5e5;
-			}
-		}
-		.text-mode{
-			width: 100%;
-			min-height: 70upx;
-			display: flex;
-			background-color: #fff;
-			border-radius: 40upx;
-			.box{
-				width: 100%;
-				padding-left: 30upx;
-				min-height: 70upx;
-				display: flex;
-				align-items: center;
-				textarea{
-					width: 100%;
-				}
-			}
-			.em{
-				flex-shrink: 0;
-				width: 80upx;
-				height: 70upx;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-			}
-		}
-	}
-}
-.record{
-	width: 40vw;
-	height: 40vw;
-	position: fixed;
-	top: 55%;
-	left: 30%;
-	background-color: rgba(0,0,0,.6);
-	border-radius: 20upx;
-	.ing{
-		width: 100%;
-		height: 30vw;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		@keyframes volatility {
-			0% {background-position: 0% 130%;}
-			20% {background-position: 0% 150%;}
-			30% {background-position: 0% 155%;}
-			40% {background-position: 0% 150%;}
-			50% {background-position: 0% 145%;}
-			70% {background-position: 0% 150%;}
-			80% {background-position: 0% 155%;}
-			90% {background-position: 0% 140%;}
-			100% {background-position: 0% 135%;}
-		}
-		.icon{
-			background-image:linear-gradient(to bottom,#f09b37,#fff 50%); 
-			background-size:100% 200%;
-			animation: volatility 1.5s ease-in-out -1.5s infinite alternate;
-			-webkit-background-clip:text; 
-			-webkit-text-fill-color:transparent; 
-			font-size: 150upx;
-			color: #f09b37;
-		}
-	}
-	.cancel{
-		width: 100%;
-		height: 30vw;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		.icon{
-			color: #fff;
-			font-size: 150upx;
-		}
-	}
-	.tis{
-		width: 100%;
-		height: 10vw;
-		display: flex;
-		justify-content: center;
-		font-size: 28upx;
-		color: #fff;
-		&.change{
-			color: #f09b37;
-		}
-	}
-}
-.content{
-	width: 100%;
-	.msg-list{
-		width: 96%;
-		padding: 0 2%;
-		position: absolute;
-		top: 0;
-		bottom: 100upx;
-		.row{
-			&:first-child{
-				margin-top: 20upx;
-			}
-			padding: 20upx 0;
-			.my .left,.other .right{
-				width: 100%;
-				display: flex;
-				.bubble{
-					max-width: 70%;
-					min-height: 50upx;
-					border-radius: 10upx;
-					padding: 15upx 20upx;
-					display: flex;
-					align-items: center;
-					font-size: 32upx;
-					word-break: break-word;
-					&.img{
-						background-color: transparent;
-						padding:0;
-						overflow: hidden;
-						image{
-							max-width: 350upx;
-							max-height: 350upx;
-						}
-					}
-					&.voice{
-						.icon{
-							font-size: 40upx;
-							display: flex;
-							align-items: center;
-						}
-						.icon:after
-						{
-							content:" ";
-							width: 53upx;
-							height: 53upx;
-							border-radius: 100%;
-							position: absolute;
-							box-sizing: border-box;
-						}
-						.length{
-							font-size: 28upx;
-						}
-					}
-				}
-			}
-			.my .right,.other .left{
-				flex-shrink: 0;
-				width: 80upx;
-				height: 80upx;
-				image{
-					width: 80upx;
-					height: 80upx;
-					border-radius: 10upx;
-				}
-			}
-			.my{
-				width: 100%;
-				display: flex;
-				justify-content: flex-end;
-				.left{
-					min-height: 80upx;
-					
-					align-items: center;
-					justify-content: flex-end;
-					.bubble{
-						background-color: #f06c7a;
-						color: #fff;
-						&.voice{
-							.icon{
-								color: #fff;
-							}
-							.length{
-								margin-right: 20upx;
-							}
-						}
-						&.play{
-							@keyframes my-play {
-								0% {
-									transform: translateX(80%);
-								}
-								100% {
-									transform: translateX(0%);
-								}
-							}
-							.icon:after
-							{
-								border-left: solid 10upx rgba(240,108,122,.5);
-								animation: my-play 1s linear infinite;
-							}
-						}
-					}
-				}
-				.right{
-					margin-left: 15upx;
-				}
-			}
-			.other{
-				width: 100%;
-				display: flex;
-				.left{
-					margin-right: 15upx;
-				}
-				.right{
-					flex-wrap: wrap;
-					.username{
-						width: 100%;
-						height: 45upx;
-						font-size: 24upx;
-						color: #999;
-						display: flex;
-						.name{
-							margin-right: 50upx;
-						}
-					}
-					.bubble{
-						background-color: #fff;
-						color: #333;
-						&.voice{
-							.icon{
-								color: #333;
-								
-							}
-							.length{
-								margin-left: 20upx;
-							}
-						}
-						&.play{
-							@keyframes other-play {
-								0% {
-									transform: translateX(-80%);
-								}
-								100% {
-									transform: translateX(0%);
-								}
-							}
-							.icon:after
-							{
-								border-right: solid 10upx rgba(255,255,255,.8);
-								
-								animation: other-play 1s linear infinite;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-}
-</style>
--- a/pages/msg/msg.vue
+++ b/pages/msg/msg.vue
@ -2,7 +2,7 @@
 	<view>
        <view class="chat-list">
 			<view class="chat" v-for="(chat,index) in chatList" :key="index">
-				<view class="row" >
+				<view class="row" @tap="toChat(chat)">
 					<view class="left">
 						<image :src="chat.face"></image>
 					</view>
@ -161,12 +161,10 @@

 		},
 		methods: {
-			 // 跳转聊天室
-			// @tap="toChat(chat)"
 			toChat(chat){
-				uni.navigateTo({
-					url:"chat/chat?name="+chat.username
-				})
+				// uni.navigateTo({
+				// 	url:"chat/chat?name="+chat.username
+				// })
 			}
 		}
 	}
--- a/pages/pay/payment/payment.vue
+++ b/pages/pay/payment/payment.vue
@ -18,7 +18,7 @@
 			</view>
 			<view class="content">
 				<view class="pay-list">
-					<view class="row" @tap="paytype='alipay'">
+					<!-- <view class="row" @tap="paytype='alipay'">
 							<view class="left">
 								<image src="/static/img/alipay.png"></image>
 							</view>
@ -28,7 +28,7 @@
 							<view class="right">
 								<radio :checked="paytype=='alipay'" color="#f06c7a" />
 							</view>
-					</view>
+					</view> -->
 					<view class="row" @tap="paytype='wxpay'">
 							<view class="left">
 								<image src="/static/img/wxpay.png"></image>
@ -60,7 +60,7 @@
 			return {
 				amount:0,
 				orderName:'',
-				paytype:'alipay'//支付类型
+				paytype:'wxpay'//支付类型
 			};
 		},
 		onLoad(e) {
--- a/pages/pay/success/success.vue
+++ b/pages/pay/success/success.vue
@ -28,7 +28,8 @@
 		methods: {
 			toUser() {
 				uni.switchTab({
-					url: '/pages/tabBar/user'
+					// /pages/tabBar/user
+					url: '../../tabBar/user/user'
 				});
 			}
 		},
--- a/pages/tabBar/cart/cart.vue
+++ b/pages/tabBar/cart/cart.vue
@ -79,11 +79,11 @@
 				selectedList:[],
 				isAllselected:false,
 				goodsList:[
-					{id:1,img:'/static/img/goods/p1.jpg',name:'商品标题商品标题商品标题商品标题商品标题商品标题商品标题商品标题商品标题商品标题',spec:'规格:S码',price:127.5,number:1,selected:false},
-					{id:2,img:'/static/img/goods/p2.jpg',name:'商品标题商品标题商品标题商品标题商品标题商品标题商品标题商品标题商品标题商品标题',spec:'规格:S码',price:127.5,number:1,selected:false},
-					{id:3,img:'/static/img/goods/p3.jpg',name:'商品标题商品标题商品标题商品标题商品标题商品标题商品标题商品标题商品标题商品标题',spec:'规格:S码',price:127.5,number:1,selected:false},
-					{id:4,img:'/static/img/goods/p4.jpg',name:'商品标题商品标题商品标题商品标题商品标题商品标题商品标题商品标题商品标题商品标题',spec:'规格:S码',price:127.5,number:1,selected:false},
-					{id:5,img:'/static/img/goods/p5.jpg',name:'商品标题商品标题商品标题商品标题商品标题商品标题商品标题商品标题商品标题商品标题',spec:'规格:S码',price:127.5,number:1,selected:false}
+					{id:1,img:'/static/img/banner1.png',name:'100元卡券',spec:'规格:S码',price:127.5,number:1,selected:false},
+					{id:2,img:'/static/img/banner1.png',name:'200元卡券',spec:'规格:S码',price:127.5,number:1,selected:false},
+					{id:3,img:'/static/img/banner1.png',name:'150中石化卡券',spec:'规格:S码',price:127.5,number:1,selected:false},
+					{id:4,img:'/static/img/banner1.png',name:'200中石化卡券',spec:'规格:S码',price:127.5,number:1,selected:false},
+					{id:5,img:'/static/img/banner1.png',name:'100其他卡券',spec:'规格:S码',price:127.5,number:1,selected:false}
 				],
 				//控制滑动效果
 				theIndex:null,
--- a/pages/tabBar/category/category.vue
+++ b/pages/tabBar/category/category.vue
@ -33,7 +33,7 @@
 					</view>
 					<view class="list">
 						<view class="box" v-for="(box,i) in category.list" :key="i" @tap="toCategory(box)">
-							<image :src="'/static/img/category/list/'+box.img"></image>
+							<image :src="box.img"></image>
 							<view class="text">{{box.name}}</view>
 						</view>
 					</view>
@ -53,16 +53,16 @@
 				city:"北京",
 				//分类列表
 				categoryList:[
-					{id:1,title:'家用电器',banner:'/static/img/category/banner.jpg',list:[
-						{name:'冰箱',	img:'1.jpg'},
-						{name:'电视',	img:'2.jpg'},
-						{name:'空调',	img:'3.jpg'},
-						{name:'洗衣机',	img:'4.jpg'},
-						{name:'风扇',	img:'5.jpg'},
-						{name:'燃气灶',	img:'6.jpg'},
-						{name:'热水器',	img:'7.jpg'},
-						{name:'电吹风',	img:'8.jpg'},
-						{name:'电饭煲',	img:'9.jpg'}
+					{id:1,title:'卡券',banner:'/static/img/category/banner.jpg',list:[
+						{name:'100元卡券',	img:'/static/img/banner1.png'},
+						{name:'200元卡券',	img:'/static/img/banner1.png'},
+						{name:'150元卡券',	img:'/static/img/banner1.png'},
+						{name:'100中石化卡券',img:'/static/img/banner1.png'},
+						{name:'150通用卡券',	img:'/static/img/banner1.png'},
+						{name:'燃气灶',	img:'/static/img/banner1.png'},
+						{name:'热水器',	img:'/static/img/banner1.png'},
+						{name:'电吹风',	img:'/static/img/banner1.png'},
+						{name:'电饭煲',	img:'/static/img/banner1.png'}
 					],},
 					// {id:2,title:'办公用品',banner:'/static/img/category/banner.jpg',list:[
 					// 	{name:'打印机',	img:'1.jpg'},
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@ -39,14 +39,14 @@
 			</view>
 		</view>
 		<!-- 分类列表 -->
-		<view class="category-list">
+		<!-- 	<view class="category-list">
 			<view class="category" v-for="(row, index) in categoryList" :key="index" @tap="toCategory(row)">
 				<view class="img">
 					<image :src="row.img"></image>
 				</view>
 				<view class="text">{{ row.name }}</view>
 			</view>
-		</view>
+		</view> -->
 		<!-- 广告图 -->
 		<view class="banner">
 			<image src="/static/img/banner.jpg"></image>
@ -99,7 +99,7 @@
 			</view>
 			<view class="loading-text">{{ loadingText }}</view>
 		</view>
-		<authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun" ></authorize>
+		<!-- <authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun" ></authorize> -->
 	</view>
 </template>

@ -132,7 +132,7 @@
 				headerTop: null,
 				statusTop: null,
 				nVueTitle: null,
-				city: '北京',
+				city: '',
 				currentSwiper: 0,
 				// 轮播图片
 				swiperList: [{
@ -181,70 +181,70 @@
 				//猜你喜欢列表
 				productList: [{
 						goods_id: 0,
-						img: '/static/img/goods/p1.jpg',
-						name: '商品名称商品名称商品名称商品名称商品名称',
+						img: '/static/img/banner1.png',
+						name: '100元中石化券',
 						price: '￥168',
 						slogan: '1235人付款'
 					},
 					{
 						goods_id: 1,
-						img: '/static/img/goods/p2.jpg',
-						name: '商品名称商品名称商品名称商品名称商品名称',
+						img: '/static/img/banner1.png',
+						name: '200元中石化券',
 						price: '￥168',
 						slogan: '1235人付款'
 					},
 					{
 						goods_id: 2,
-						img: '/static/img/goods/p3.jpg',
-						name: '商品名称商品名称商品名称商品名称商品名称',
+						img: '/static/img/banner1.png',
+						name: '150元中石化券',
 						price: '￥168',
 						slogan: '1235人付款'
 					},
 					{
 						goods_id: 3,
-						img: '/static/img/goods/p4.jpg',
+						img: '/static/img/banner1.png',
 						name: '商品名称商品名称商品名称商品名称商品名称',
 						price: '￥168',
 						slogan: '1235人付款'
 					},
 					{
 						goods_id: 4,
-						img: '/static/img/goods/p5.jpg',
+						img: '/static/img/banner1.png',
 						name: '商品名称商品名称商品名称商品名称商品名称',
 						price: '￥168',
 						slogan: '1235人付款'
 					},
 					{
 						goods_id: 5,
-						img: '/static/img/goods/p6.jpg',
+						img: '/static/img/banner1.png',
 						name: '商品名称商品名称商品名称商品名称商品名称',
 						price: '￥168',
 						slogan: '1235人付款'
 					},
 					{
 						goods_id: 6,
-						img: '/static/img/goods/p7.jpg',
+						img: '/static/img/banner1.png',
 						name: '商品名称商品名称商品名称商品名称商品名称',
 						price: '￥168',
 						slogan: '1235人付款'
 					},
 					{
 						goods_id: 7,
-						img: '/static/img/goods/p8.jpg',
+						img: '/static/img/banner1.png',
 						name: '商品名称商品名称商品名称商品名称商品名称',
 						price: '￥168',
 						slogan: '1235人付款'
 					},
 					{
 						goods_id: 8,
-						img: '/static/img/goods/p9.jpg',
+						img: '/static/img/banner1.png',
 						name: '商品名称商品名称商品名称商品名称商品名称',
 						price: '￥168',
 						slogan: '1235人付款'
 					},
 					{
 						goods_id: 9,
-						img: '/static/img/goods/p10.jpg',
+						img: '/static/img/banner1.png',
 						name: '商品名称商品名称商品名称商品名称商品名称',
 						price: '￥168',
 						slogan: '1235人付款'
@ -296,7 +296,7 @@
 				encryptedData: PhoneNumber.detail.encryptedData
 			}
 			GetPhoneNumber(params).then(res => {
-				console.log('方式电风扇发顺丰是=======' + JSON.stringify(res))
+				// console.log('方式电风扇发顺丰是=======' + JSON.stringify(res))
 			});
 		},

@ -305,6 +305,7 @@
 		},
 		onLoad() {
 			let _this = this;
+			_this.postionIng();
 			// uni.showLoading({
 			// 	title: '登录中...'
 			// });
@ -388,6 +389,27 @@
 			this.loadPromotion();
 		},
 		methods: {
+			postionIng() {
+				let that = this;
+				uni.getLocation({
+					type: 'wgs84',
+					success: function(res) {
+						console.log('=====' + JSON.stringify(res));
+						uni.request({
+							url: 'https://apis.map.qq.com/ws/geocoder/v1/?location=' + res.latitude +
+								',' + res.longitude + '&key=YQDBZ-T54K4-5J6U7-DO3BA-CNZJO-PTFMU',
+							data: {},
+							success: function(res) {
+								that.city = res.data.result.address_component.city.replace(/市/g,'');
+								// that.city = ;
+								let a = res.data.result.ad_info.adcode.substring(5,'');
+								console.log('======'+a+'0');
+							}
+						})
+					}
+				})
+			},
+
 			//加载Promotion 并设定倒计时,,实际应用中应该是ajax加载此数据。
 			loadPromotion() {
 				let cutTime = new Date();
--- a/pages/tabBar/user/user.vue
+++ b/pages/tabBar/user/user.vue
@ -29,14 +29,6 @@
 				<view class="icon qr"></view>
 			</view>
 		</view>
-		<!-- VIP banner -->
-		<view class="VIP">
-			<view class="img">
-				<image src="/static/img/VIP.png"></image>
-			</view>
-			<view class="title">开通VIP会员</view>
-			<view class="tis">会员特权</view>
-		</view>
 		<!-- 订单-余额 -->
 		<view class="order">
 			<!-- 订单类型 -->
@ -55,10 +47,6 @@
 						<view class="num">{{user.integral}}</view>
 						<view class="text">积分</view>
 					</view>
-					<view class="box">
-						<view class="num">{{user.envelope}}</view>
-						<view class="text">佣金</view>
-					</view>
 					<view class="box">
 						<view class="num">{{user.balance}}</view>
 						<view class="text">余额</view>
@ -111,29 +99,18 @@
 				},
 				// 订单类型
 				orderList:[
-					// {text:'待付款',icon:"fukuan"},
-					// {text:'待发货',icon:"fahuo"},
-					// {text:'待收货',icon:"shouhuo"},
-					// {text:'待评价',icon:"pingjia"},
-					// {text:'退换货',icon:"tuihuo"}
-					{text:'全部',icon:"tuihuo"},
 					{text:'待付款',icon:"fukuan"},
-					{text:'待使用',icon:"shouhuo"},
-					{text:'已完成',icon:"pingjia"}
+					{text:'待发货',icon:"fahuo"},
+					{text:'待收货',icon:"shouhuo"},
+					{text:'待评价',icon:"pingjia"},
 				],
 				// 工具栏列表
 				mytoolbarList:[
 					{url:'../../user/keep/keep',text:'充值记录',img:'/static/img/user/point.png'},
 					{url:'../../user/coupon/coupon',text:'优惠券',img:'/static/img/user/quan.png'}, 
 					{url:'',text:'中石化券码',img:'/static/img/user/renw.png'},
-					// {url:'',text:'领红包',img:'/static/img/user/momey.png'},
-					
-					{url:'../../user/address/address',text:'收货地址',img:'/static/img/user/addr.png'},
-					// {url:'',text:'账户安全',img:'/static/img/user/security.png'},
-					// {url:'',text:'银行卡',img:'/static/img/user/bank.png'},
-					// {url:'',text:'抽奖',img:'/static/img/user/choujiang.png'},
-					// {text:'客服',img:'/static/img/user/kefu.png'},
-					// {text:'签到',img:'/static/img/user/mingxi.png'}
+					{url:'',text:'卡券',img:'/static/img/user/choujiang.png'},
+					{url:'../../login/login',text:'商户入口',img:'/static/img/user/mingxi.png'}
 					
 				]
 			}
@ -299,7 +276,7 @@
 		align-items: center;
 		// position: relative;
 		background-color: #f06c7a;
-		padding-bottom: 120upx;
+		padding-bottom: 40rpx;
 		.left{
 			width: 20vw;
 			height: 20vw;
--- a/pages/user/deposit/deposit.vue
+++ b/pages/user/deposit/deposit.vue
@ -38,7 +38,7 @@
 			</view>
 			<view class="content">
 				<view class="pay-list">
-					<view class="row" @tap="paytype='alipay'">
+					<!-- <view class="row" @tap="paytype='alipay'">
 							<view class="left">
 								<image src="/static/img/alipay.png"></image>
 							</view>
@ -48,7 +48,7 @@
 							<view class="right">
 								<radio :checked="paytype=='alipay'" color="#f06c7a" />
 							</view>
-					</view>
+					</view> -->
 					<view class="row" @tap="paytype='wxpay'">
 							<view class="left">
 								<image src="/static/img/wxpay.png"></image>
@ -80,7 +80,7 @@
 			return {
 				inputAmount:'',//金额
 				amountList:[10,50,100],//预设3个可选快捷金额
-				paytype:'alipay'//支付类型
+				paytype:'wxpay'//支付类型
 			};
 		},
 		methods:{
--- a/pages/user/order_list/order_list.nvue
+++ b/pages/user/order_list/order_list.nvue
@ -1,542 +0,0 @@
-<template>
-	<div>
-		<div class="tabs">
-			<div class="tab">
-				<text v-for="(tab, tbIndex) in orderType" :key="tbIndex" 
-					@click="showType(tbIndex)" 
-					class="tab-text" 
-					:class="[tbIndex == selectIndex ? 'tab-text-on' : '']"
-				>{{ tab }}</text>
-			</div>
-			<div class="border" :style="{ transform: 'translateX(' + translateXW + 'px)' }"></div>
-		</div>
-		<slider class="slider" :auto-play="false" :infinite="false" :index="selectIndex" @change="sliderChange">
-			<list class="frame" v-for="(page, index) in orderList" :key="index">
-				<cell v-if="page.length == 0">
-					<div class="onorder">
-						<image class="onorder-image" src="https://ae01.alicdn.com/kf/HTB1FGJ7XED1gK0jSZFG762d3FXam.png"></image>
-						<text class="onorder-text">没有相关订单</text>
-					</div>
-				</cell>
-				<cell v-for="(row, rowIndex) in page" :key="rowIndex" v-if="page.length > 0">
-					<div class="row">
-						<text class="type">{{ typeText[row.type] }}</text>
-						<div class="order-info">
-							<div class="order-info-left"><image class="left-image" :src="row.img"></image></div>
-							<div class="order-info-right">
-								<text class="order-info-right-name">{{ row.name }}</text>
-								<text class="order-info-right-spec">{{ row.spec }}</text>
-								<div class="order-info-right-price-number">
-									<text class="order-info-right-unit">￥</text>
-									<text class="order-info-right-price">{{ row.price }}</text>
-									<text class="order-info-right-multiplier">x</text>
-									<text class="order-info-right-number">{{ row.numner }}</text>
-								</div>
-							</div>
-						</div>
-						<div class="detail">
-							<text class="detail-number">共{{ row.numner }}件商品</text>
-							<div class="detail-sum">
-								<text class="detail-sum-text">合计￥</text>
-								<text class="detail-sum-payment">{{ row.payment }}</text>
-								<text class="detail-sum-nominal">(含运费 ￥{{ row.freight }})</text>
-							</div>
-						</div>
-						<div class="btns">
-							<div class="btns-div" v-if="row.type == 'unpaid'">
-								<text class="btns-btn default" @click="cancelOrder(row)">取消订单</text>
-								<text class="btns-btn pay" @click="toPayment(row)">付款</text>
-							</div>
-							<div class="btns-div" v-if="row.type == 'back'"><text class="btns-btn default" @click="remindDeliver(row)">提醒发货</text></div>
-							<div class="btns-div" v-if="row.type == 'unreceived'">
-								<text class="btns-btn default" @click="showLogistics(row)">查看物流</text>
-								<text class="btns-btn pay">确认收货</text>
-								<text class="btns-btn pay">我要退货</text>
-							</div>
-							<div class="btns-div" v-if="row.type == 'received'">
-								<text class="btns-btn default">评价</text>
-								<text class="btns-btn default">再次购买</text>
-							</div>
-							<div class="btns-div" v-if="row.type == 'completed'"><text class="btns-btn default">再次购买</text></div>
-							<div class="btns-div" v-if="row.type == 'refunds'"><text class="btns-btn default">查看进度</text></div>
-							<div class="btns-div" v-if="row.type == 'cancelled'"><text class="btns-btn default">已取消</text></div>
-						</div>
-					</div>
-				</cell>
-			</list>
-		</slider>
-	</div>
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			selectIndex: 0,
-			translateX: [0, 125, 250, 375, 500, 625, 750],
-			translateXW: 0,
-			orderType: ['全部', '待付款', '待发货', '待收货', '待评价', '退换货'],
-			typeText: {
-				unpaid: '等待付款',
-				back: '等待商家发货',
-				unreceived: '商家已发货',
-				received: '等待用户评价',
-				completed: '交易已完成',
-				refunds: '商品退货处理中',
-				cancelled: '订单已取消'
-			},
-			orderList: [
-				[
-					{
-						type: 'unpaid',
-						ordersn: 0,
-						goods_id: 0,
-						img: 'https://ae01.alicdn.com/kf/HTB16wepeW5s3KVjSZFNq6AD3FXaJ.jpg',
-						name: '商品名称商品名称商品名称商品名称商品名称',
-						price: '168.00',
-						payment: 168.0,
-						freight: 12.0,
-						spec: '规格:S码',
-						numner: 1
-					},
-					{
-						type: 'unpaid',
-						ordersn: 1,
-						goods_id: 1,
-						img: 'https://ae01.alicdn.com/kf/HTB1duHtcfBj_uVjSZFpq6A0SXXaJ.jpg',
-						name: '商品名称商品名称商品名称商品名称商品名称',
-						price: '168.00',
-						payment: 168.0,
-						freight: 12.0,
-						spec: '规格:S码',
-						numner: 1
-					},
-					{
-						type: 'back',
-						ordersn: 2,
-						goods_id: 1,
-						img: 'https://ae01.alicdn.com/kf/HTB173epeW5s3KVjSZFNq6AD3FXai.jpg',
-						name: '商品名称商品名称商品名称商品名称商品名称',
-						price: '168.00',
-						payment: 168.0,
-						freight: 12.0,
-						spec: '规格:S码',
-						numner: 1
-					},
-					{
-						type: 'unreceived',
-						ordersn: 3,
-						goods_id: 1,
-						img: 'https://ae01.alicdn.com/kf/HTB173epeW5s3KVjSZFNq6AD3FXai.jpg',
-						name: '商品名称商品名称商品名称商品名称商品名称',
-						price: '168.00',
-						payment: 168.0,
-						freight: 12.0,
-						spec: '规格:S码',
-						numner: 1
-					},
-					{
-						type: 'received',
-						ordersn: 4,
-						goods_id: 1,
-						img: 'https://ae01.alicdn.com/kf/HTB1JC1fe.CF3KVjSZJnq6znHFXaG.jpg',
-						name: '商品名称商品名称商品名称商品名称商品名称',
-						price: '168.00',
-						payment: 168.0,
-						freight: 12.0,
-						spec: '规格:S码',
-						numner: 1
-					},
-					{
-						type: 'completed',
-						ordersn: 5,
-						goods_id: 1,
-						img: 'https://ae01.alicdn.com/kf/HTB1GSqoeWWs3KVjSZFxq6yWUXXav.jpg',
-						name: '商品名称商品名称商品名称商品名称商品名称',
-						price: '168.00',
-						payment: 168.0,
-						freight: 12.0,
-						spec: '规格:S码',
-						numner: 1
-					},
-					{
-						type: 'refunds',
-						ordersn: 6,
-						goods_id: 1,
-						img: 'https://ae01.alicdn.com/kf/HTB1_Mefe3aH3KVjSZFjq6AFWpXaJ.jpg',
-						name: '商品名称商品名称商品名称商品名称商品名称',
-						price: '168',
-						payment: 168.0,
-						freight: 12.0,
-						spec: '规格:S码',
-						numner: 1
-					},
-					{
-						type: 'cancelled',
-						ordersn: 7,
-						goods_id: 1,
-						img: 'https://ae01.alicdn.com/kf/HTB1Lu1pe8Cw3KVjSZFuq6AAOpXaI.jpg',
-						name: '商品名称商品名称商品名称商品名称商品名称',
-						price: '168',
-						payment: 168.0,
-						freight: 12.0,
-						spec: '规格:S码',
-						numner: 1
-					}
-				],
-				[
-					{
-						type: 'unpaid',
-						ordersn: 0,
-						goods_id: 0,
-						img: 'https://ae01.alicdn.com/kf/HTB1iMife3aH3KVjSZFjq6AFWpXaA.jpg',
-						name: '商品名称商品名称商品名称商品名称商品名称',
-						price: '168',
-						payment: 168.0,
-						freight: 12.0,
-						spec: '规格:S码',
-						numner: 1
-					},
-					{
-						type: 'unpaid',
-						ordersn: 1,
-						goods_id: 1,
-						img: 'https://ae01.alicdn.com/kf/HTB1D6Sfe4iH3KVjSZPfq6xBiVXaG.jpg',
-						name: '商品名称商品名称商品名称商品名称商品名称',
-						price: '168',
-						payment: 168.0,
-						freight: 12.0,
-						spec: '规格:S码',
-						numner: 1
-					}
-				],
-				[
-					//无
-				],
-				[
-					{
-						type: 'unreceived',
-						ordersn: 3,
-						goods_id: 1,
-						img: 'https://ae01.alicdn.com/kf/HTB1IjSfe4iH3KVjSZPfq6xBiVXa4.jpg',
-						name: '商品名称商品名称商品名称商品名称商品名称',
-						price: '168',
-						payment: 168.0,
-						freight: 12.0,
-						spec: '规格:S码',
-						numner: 1
-					}
-				],
-				[
-					{
-						type: 'received',
-						ordersn: 4,
-						goods_id: 1,
-						img: 'https://ae01.alicdn.com/kf/HTB16wepeW5s3KVjSZFNq6AD3FXaJ.jpg',
-						name: '商品名称商品名称商品名称商品名称商品名称',
-						price: '168',
-						payment: 168.0,
-						freight: 12.0,
-						spec: '规格:S码',
-						numner: 1
-					}
-				],
-				[
-					{
-						type: 'refunds',
-						ordersn: 6,
-						goods_id: 1,
-						img: 'https://ae01.alicdn.com/kf/HTB16wepeW5s3KVjSZFNq6AD3FXaJ.jpg',
-						name: '商品名称商品名称商品名称商品名称商品名称',
-						price: '168',
-						payment: 168.0,
-						freight: 12.0,
-						spec: '规格:S码',
-						numner: 1
-					}
-				]
-			]
-		};
-	},
-	created() {
-		this.selectIndex = parseInt(uni.getStorageSync('tbIndex'))+1;
-	},
-	methods: {
-		showType(tbIndex) {
-			this.selectIndex = tbIndex;
-			this.translateXW = this.translateX[tbIndex];
-			console.log('this.selectIndex: ' + this.selectIndex);
-		},
-		sliderChange(e) {
-			this.selectIndex = e.index;
-			this.translateXW = this.translateX[e.index];
-			console.log('e.index: ' + JSON.stringify(e.index));
-		},
-
-		remindDeliver(row) {
-			uni.showToast({
-				title: '已提醒商家发货'
-			});
-		},
-		cancelOrder(row) {
-			uni.showModal({
-				title: '取消订单',
-				content: '确定取消此订单？',
-				success: res => {
-					if (res.confirm) {
-						console.log('用户点击确定');
-						this.doCancelOrder(row.ordersn);
-					} else if (res.cancel) {
-						console.log('用户点击取消');
-					}
-				}
-			});
-		},
-		doCancelOrder(ordersn) {
-			let typeNum = this.orderList.length;
-			for (let i = 0; i < typeNum; i++) {
-				let list = this.orderList[i];
-				let orderNum = list.length;
-				if (orderNum > 0 && list[0].type == 'unpaid') {
-					for (let j = 0; j < orderNum; j++) {
-						if (this.orderList[i][j].ordersn == ordersn) {
-							this.orderList[i][j].type = 'cancelled';
-							break;
-						}
-					}
-				}
-			}
-		},
-		toPayment(row) {
-			//本地模拟订单提交UI效果
-			uni.showLoading({
-				title: '正在获取订单...'
-			});
-			let paymentOrder = [];
-			paymentOrder.push(row);
-			setTimeout(() => {
-				uni.setStorage({
-					key: 'paymentOrder',
-					data: paymentOrder,
-					success: () => {
-						uni.hideLoading();
-						uni.navigateTo({
-							url: '../../pay/payment/payment?amount=' + row.payment
-						});
-					}
-				});
-			}, 500);
-		}
-	}
-};
-</script>
-
-<style>
-.tabs {
-	width: 750px;
-	flex-direction: row;
-	flex-wrap: wrap;
-	height: 80px;
-	align-items: center;
-	background-color: #f8f8f8;
-}
-
-.tab {
-	width: 750px;
-	height: 76px;
-	flex-direction: row;
-	flex-wrap: wrap;
-}
-
-.tab-text {
-	width: 125px;
-	height: 76px;
-	line-height: 76px;
-	text-align: center;
-	font-size: 26px;
-	color: #444;
-}
-.tab-text-on {
-	color: #f06c7a;
-}
-.border {
-	width: 75px;
-	margin: 0 25px;
-	height: 4px;
-	background-color: #f06c7a;
-	transition-property: transform;
-	transition-duration: 0.3s;
-	transition-delay: 0s;
-	transition-timing-function: ease;
-}
-
-.slider {
-	width: 750px;
-	top: 80px;
-	bottom: 0;
-	background-color: #f3f3f3;
-	position: absolute;
-}
-
-.frame {
-	width: 750px;
-	padding: 20px 20px;
-}
-.onorder {
-	width: 750px;
-	height: 375px;
-	display: flex;
-	justify-content: center;
-	align-content: center;
-	flex-wrap: wrap;
-	flex-direction: row;
-	margin-top: 50px;
-}
-.onorder-image {
-	width: 150;
-	height: 150;
-	border-radius: 150;
-}
-.onorder-text {
-	width: 750;
-	height: 60px;
-	font-size: 28px;
-	color: #444;
-	text-align: center;
-	line-height: 60px;
-}
-
-.row {
-	width: 710px;
-	height: 400px;
-	padding: 10px 20px;
-	border-radius: 10px;
-	background-color: #fff;
-	margin-top: 20px;
-	flex-direction: column;
-}
-
-.type {
-	width: 710px;
-	font-size: 26px;
-	color: #ec652f;
-	height: 50px;
-	text-align: left;
-}
-
-.order-info {
-	width: 710px;
-	height: 188px;
-	flex-direction: row;
-}
-
-.left {
-	flex-shrink: 0;
-	width: 188px;
-	height: 188px;
-}
-.left-image {
-	width: 188px;
-	height: 188px;
-	border-radius: 10px;
-}
-
-.order-info-right {
-	width: 472px;
-	height: 188px;
-	margin-left: 10px;
-	position: relative;
-	flex-direction: row;
-	flex-wrap: wrap;
-}
-
-.order-info-right-name {
-	width: 472px;
-	height: 94px;
-	font-size: 28px;
-	overflow: hidden;
-}
-
-.order-info-right-spec {
-	color: #a7a7a7;
-	font-size: 22px;
-}
-
-.order-info-right-price-number {
-	position: absolute;
-	bottom: 0;
-	width: 472px;
-	color: #333;
-	justify-content: flex-end;
-	flex-direction: row;
-	align-items: flex-end;
-}
-.order-info-right-unit,
-.order-info-right-multiplier {
-	font-size: 20px;
-}
-.order-info-right-price,
-.order-info-right-number {
-	font-size: 24px;
-}
-
-.detail {
-	width: 670px;
-	height: 60px;
-	justify-content: flex-end;
-	align-items: flex-end;
-	flex-direction: row;
-}
-.detail-number {
-	font-size: 26px;
-}
-.detail-sum {
-	padding: 0 8px;
-	flex-direction: row;
-	align-items: flex-end;
-}
-.detail-sum-text {
-	font-size: 26px;
-}
-.detail-sum-payment {
-	font-size: 30px;
-}
-.detail-sum-nominal {
-	font-size: 26px;
-}
-.btns {
-	width: 670px;
-	height: 80px;
-	flex-direction: row;
-	align-items: center;
-}
-.btns-div {
-	width: 670px;
-	height: 50px;
-	justify-content: flex-end;
-	flex-direction: row;
-}
-.btns-btn {
-	min-width: 120px;
-	height: 50px;
-	padding: 0 20px;
-	border-radius: 50px;
-	line-height: 50px;
-	text-align: center;
-	font-size: 28px;
-	margin-left: 20px;
-	border-style: solid;
-	border-width: 1px;
-	border-color: #ccc;
-}
-
-.default {
-	border-color: #ccc;
-	color: #666;
-}
-
-.pay {
-	border-color: #ec652f;
-	color: #ec652f;
-}
-</style>
--- a/pages/user/order_list/order_list.vue
+++ b/pages/user/order_list/order_list.vue
@ -65,7 +65,8 @@
 					refunds:'商品退货处理中',
 					cancelled:'订单已取消'
 				},
-				orderType: ['全部','待付款','待发货','待收货','待评价','退换货'],
+				// 退换货
+				orderType: ['全部','待付款','待发货','待收货','待评价'],
 				//订单列表 演示数据
 				orderList:[
 					[
--- a/static/css/login.scss
+++ b/static/css/login.scss
@ -47,13 +47,13 @@ page {
 	.btn {
 		color: #f06c7a;
 		width: 100%;
-		height: 90upx;
+		height: 90rpx;
 	    display: flex;
 	    justify-content: center;
 		align-items: center;
-		border-radius: 45upx;
+	    border-radius: 45rpx;
 	    background-color: #fff;
-		font-size: 40upx;
+		font-size: 40rpx;
 	}
 }
 .re {
--- a/static/img/banner1.png
+++ b/static/img/banner1.png
--- a/static/img/emoji/100.gif
+++ b/static/img/emoji/100.gif
--- a/static/img/emoji/101.gif
+++ b/static/img/emoji/101.gif
--- a/static/img/emoji/102.gif
+++ b/static/img/emoji/102.gif
--- a/static/img/emoji/103.gif
+++ b/static/img/emoji/103.gif
--- a/static/img/emoji/104.gif
+++ b/static/img/emoji/104.gif
--- a/static/img/emoji/105.gif
+++ b/static/img/emoji/105.gif
--- a/static/img/emoji/106.gif
+++ b/static/img/emoji/106.gif
--- a/static/img/emoji/107.gif
+++ b/static/img/emoji/107.gif
--- a/static/img/emoji/108.gif
+++ b/static/img/emoji/108.gif
--- a/static/img/emoji/109.gif
+++ b/static/img/emoji/109.gif
--- a/static/img/emoji/110.gif
+++ b/static/img/emoji/110.gif
--- a/static/img/emoji/111.gif
+++ b/static/img/emoji/111.gif
--- a/static/img/emoji/112.gif
+++ b/static/img/emoji/112.gif
--- a/static/img/emoji/113.gif
+++ b/static/img/emoji/113.gif
--- a/static/img/emoji/114.gif
+++ b/static/img/emoji/114.gif
--- a/static/img/emoji/115.gif
+++ b/static/img/emoji/115.gif
--- a/static/img/emoji/116.gif
+++ b/static/img/emoji/116.gif
--- a/static/img/emoji/117.gif
+++ b/static/img/emoji/117.gif
--- a/static/img/emoji/118.gif
+++ b/static/img/emoji/118.gif
--- a/static/img/emoji/119.gif
+++ b/static/img/emoji/119.gif
--- a/static/img/emoji/120.gif
+++ b/static/img/emoji/120.gif
--- a/static/img/emoji/121.gif
+++ b/static/img/emoji/121.gif
--- a/static/img/emoji/122.gif
+++ b/static/img/emoji/122.gif
--- a/static/img/emoji/123.gif
+++ b/static/img/emoji/123.gif
--- a/static/img/emoji/124.gif
+++ b/static/img/emoji/124.gif
--- a/static/img/emoji/125.gif
+++ b/static/img/emoji/125.gif
--- a/static/img/emoji/126.gif
+++ b/static/img/emoji/126.gif
--- a/static/img/emoji/127.gif
+++ b/static/img/emoji/127.gif
--- a/static/img/emoji/128.gif
+++ b/static/img/emoji/128.gif
--- a/static/img/emoji/129.gif
+++ b/static/img/emoji/129.gif
--- a/static/img/emoji/130.gif
+++ b/static/img/emoji/130.gif
--- a/static/img/emoji/131.gif
+++ b/static/img/emoji/131.gif
--- a/static/img/emoji/132.gif
+++ b/static/img/emoji/132.gif
--- a/static/img/emoji/133.gif
+++ b/static/img/emoji/133.gif
--- a/static/img/emoji/134.gif
+++ b/static/img/emoji/134.gif
--- a/static/img/emoji/135.gif
+++ b/static/img/emoji/135.gif
--- a/static/img/emoji/136.gif
+++ b/static/img/emoji/136.gif
--- a/static/img/emoji/137.gif
+++ b/static/img/emoji/137.gif
--- a/static/img/emoji/138.gif
+++ b/static/img/emoji/138.gif
--- a/static/img/emoji/139.gif
+++ b/static/img/emoji/139.gif
--- a/static/img/emoji/140.gif
+++ b/static/img/emoji/140.gif
--- a/static/img/emoji/141.gif
+++ b/static/img/emoji/141.gif
--- a/static/img/emoji/142.gif
+++ b/static/img/emoji/142.gif
--- a/static/img/emoji/143.gif
+++ b/static/img/emoji/143.gif
--- a/static/img/emoji/144.gif
+++ b/static/img/emoji/144.gif
--- a/static/img/emoji/145.gif
+++ b/static/img/emoji/145.gif
--- a/static/img/emoji/146.gif
+++ b/static/img/emoji/146.gif
--- a/static/img/emoji/147.gif
+++ b/static/img/emoji/147.gif
--- a/static/img/emoji/148.gif
+++ b/static/img/emoji/148.gif
--- a/static/img/emoji/149.gif
+++ b/static/img/emoji/149.gif
--- a/static/img/emoji/150.gif
+++ b/static/img/emoji/150.gif
--- a/static/img/emoji/151.gif
+++ b/static/img/emoji/151.gif
--- a/static/img/emoji/152.gif
+++ b/static/img/emoji/152.gif
--- a/static/img/emoji/153.gif
+++ b/static/img/emoji/153.gif
--- a/static/img/emoji/154.gif
+++ b/static/img/emoji/154.gif
--- a/static/img/emoji/155.gif
+++ b/static/img/emoji/155.gif
--- a/static/img/emoji/156.gif
+++ b/static/img/emoji/156.gif
--- a/static/img/emoji/157.gif
+++ b/static/img/emoji/157.gif
--- a/static/img/emoji/158.gif
+++ b/static/img/emoji/158.gif
--- a/static/img/emoji/159.gif
+++ b/static/img/emoji/159.gif
--- a/static/img/emoji/160.gif
+++ b/static/img/emoji/160.gif
--- a/static/img/emoji/161.gif
+++ b/static/img/emoji/161.gif
--- a/static/img/emoji/162.gif
+++ b/static/img/emoji/162.gif
--- a/static/img/emoji/163.gif
+++ b/static/img/emoji/163.gif
--- a/static/img/emoji/164.gif
+++ b/static/img/emoji/164.gif
--- a/static/img/emoji/165.gif
+++ b/static/img/emoji/165.gif
--- a/static/img/emoji/166.gif
+++ b/static/img/emoji/166.gif
--- a/static/img/emoji/167.gif
+++ b/static/img/emoji/167.gif
--- a/static/img/emoji/168.gif
+++ b/static/img/emoji/168.gif
--- a/static/img/emoji/169.gif
+++ b/static/img/emoji/169.gif
--- a/static/img/emoji/170.gif
+++ b/static/img/emoji/170.gif
--- a/static/img/emoji/171.gif
+++ b/static/img/emoji/171.gif
--- a/static/img/emoji/172.gif
+++ b/static/img/emoji/172.gif
--- a/static/img/emoji/173.gif
+++ b/static/img/emoji/173.gif
--- a/static/img/emoji/174.gif
+++ b/static/img/emoji/174.gif
--- a/static/img/emoji/175.gif
+++ b/static/img/emoji/175.gif
--- a/static/img/emoji/176.gif
+++ b/static/img/emoji/176.gif
--- a/static/img/emoji/177.gif
+++ b/static/img/emoji/177.gif
--- a/static/img/emoji/178.gif
+++ b/static/img/emoji/178.gif
--- a/static/img/emoji/179.gif
+++ b/static/img/emoji/179.gif
--- a/static/img/emoji/180.gif
+++ b/static/img/emoji/180.gif
--- a/static/img/emoji/181.gif
+++ b/static/img/emoji/181.gif
--- a/Show More
+++ b/Show More