Merge branch 'lk' of http://git.cyjyyjy.com/yanghao/bawangcan-shop into lk

common/config.js

@@ -1,4 +1,4 @@
-const ROOTPATH1 = "https://shop.canmoujiang.com/sqx_fast";
+const ROOTPATH1 = "http://192.168.0.112:8891/sqx_fast";
 // const ROOTPATH1 = "http://192.168.1.17:8891/sqx_fast";
 const ROOTPATH = "https://shop.canmoujiang.com/sqx_fast";
 module.exports = {

manifest.json

@@ -135,9 +135,9 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxdcb523b59202e3bf",
+        "appid" : "wx00b9154f935c83a3",
         "setting" : {
-            "urlCheck" : false,
+            "urlCheck" : true,
             "es6" : true
         },
         "plugins" : {
@@ -146,11 +146,7 @@
                 "provider" : "wx63ffb7b7894e99ae"
             }
         },
-        "permission" : {
+        "permission" : {}
-            "scope.userLocation" : {
-                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
-            }
-        }
     },
     "mp-alipay" : {
         "usingComponents" : true

pages.json

@@ -6,7 +6,7 @@
 			"path": "pages/index/shopIndex",
 			"style": {
 				"navigationBarTextStyle": "black",
-				"navigationBarTitleText": "商户版",
+				"navigationBarTitleText": "商家版",
 				"enablePullDownRefresh": false
 			}
 		},
@@ -152,8 +152,9 @@
 		{
 			"path": "pages/my/index",
 			"style": {
-				"navigationStyle": "custom",
+				"enablePullDownRefresh": false,
-				"enablePullDownRefresh": false
+				"navigationBarTitleText": "我的",
+				"navigationBarTextStyle": "black"
 			}
 		},
 		{
@@ -515,25 +516,31 @@
 	},
 	"tabBar": {
 		"color": "#B3B3B3",
-		"selectedColor": "#FF3530",
+		"selectedColor": "#FF4848",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
 		"list": [{
 				"pagePath": "pages/index/shopIndex",
-				"iconPath": "static/img/tabbar/shop.png",
+				"iconPath": "static/img/tabbar/shop2.png",
-				"selectedIconPath": "static/img/tabbar/shop1.png",
+				"selectedIconPath": "static/img/tabbar/shopselected.png",
 				"text": "店铺"
 			},
+			{
+					"pagePath": "pages/my/toExamine",
+					"iconPath": "static/img/tabbar/dingdan.png",
+					"selectedIconPath": "static/img/tabbar/dingdans.png",
+					"text": "订单"
+				},
 			{
 				"pagePath": "pages/activity/index",
-				"iconPath": "static/img/tabbar/actives.png",
+				"iconPath": "./static/img/tabbar/activity.png",
-				"selectedIconPath": "static/img/tabbar/actives1.png",
+				"selectedIconPath": "static/img/tabbar/activityselected.png",
 				"text": "活动"
 			},
 			{
 				"pagePath": "pages/my/index",
-				"iconPath": "static/img/tabbar/my.png",
+				"iconPath": "static/img/tabbar/mine.png",
-				"selectedIconPath": "static/img/tabbar/my1.png",
+				"selectedIconPath": "static/img/tabbar/mines.png",
 				"text": "我的"
 			}
 		]

pages/activity/index.vue

@@ -3,7 +3,7 @@
 		<view class="header">
 			<view class="shopName">
 				<!-- <view class=""  @tap="shopBtn()">小曲奇的店铺 <image class="icons" src="../../static/img/home/down.png" mode="widthFix"></image></view>	 -->
-				<u-dropdown :active-color="colors" title-size='34' style="position: absolute;width: 93%;">
+				<u-dropdown :active-color="colors" title-size='34' style="position: absolute;width: 120px;left: 35rpx;top:15px">
 					<u-dropdown-item v-model="value1" height='600rpx' :title="title" :options="options1"
 						@change="changes">
 					</u-dropdown-item>
@@ -20,7 +20,7 @@
 					</view> -->
 				</view>
 				<view class="header_Right" @tap="release(0)">
-					<image class="showaddImg" src="../../static/img/home/fabu.png"></image>
+					<image class="showaddImg" src="../../static/img/home/feiji.png"></image>
 					<view class="showAdd">发布活动</view>
 				</view>
 			</view>
@@ -60,9 +60,7 @@
 					name: '今日活动'
 				}, {
 					name: '待发布活动'
-				}, {
+				},  {
-					name: '历史活动'
-				}, {
 					name: '发布记录'
 				}],
 				current: 0,
@@ -231,6 +229,7 @@
 						line-height: 60rpx;
 						font-size: 36rpx;
 						font-weight: 600;
+						
 
 						.icons {
 							width: 30rpx;

pages/index/addShop.vue

@@ -539,7 +539,7 @@
 			}
 
 			.qr {
-				background: #FF4701;
+				background: #FF2B2B;
 			}
 		}
 

pages/index/shopIndex.vue

@@ -2,7 +2,7 @@
 	<view class="container">
 		<view class="header">
 			<view class="shopName">
-				<u-dropdown :active-color="colors" title-size='34' style="position: absolute;width: 93%;">
+				<u-dropdown :active-color="colors" title-size='34' style="position: absolute;width: 120px;left:35rpx;top:30rpx">
 					<u-dropdown-item v-model="value1" height='600rpx' :title="title" :options="options1"
 						@change="changes">
 					</u-dropdown-item>
@@ -12,12 +12,11 @@
 				<view class="header_Left">
 					<view class="left_top">
 						<image class="logo" :src="merchantLogo"></image>
-
 					</view>
 					<view class="left_down">
-						<image class="icons1" src="../../static/img/home/datas.png"></image>
+						<image class="icons1" src="../../static/img/home/calendar.png"></image>
-						<view class="times"><span @tap="times(1)" style="text-decoration:underline">{{startTime}}
+						<view class="times"><span @tap="times(1)" >{{startTime}}
-							</span>至<span @tap="times(2)" style="text-decoration:underline">{{endTime}}</span></view>
+							</span>至<span @tap="times(2)" >{{endTime}}</span></view>
 						<u-picker mode="time" v-model="show1" title="开始时间" @confirm="times1()" :params="params">
 						</u-picker>
 						<u-picker mode="time" v-model="show2" title="截止时间" @confirm="times2()" :params="params">
@@ -25,29 +24,47 @@
 					</view>
 				</view>
 				<view class="header_Right" @tap="release()">
-					<image class="showaddImg" src="../../static/img/home/shop.png"></image>
+					<image class="showaddImg" src="../../static/img/home/xinzeng.png"></image>
-					<view class="showAdd">新增店铺</view>
+					<view class="showAdd">+新增店铺</view>
 				</view>
 			</view>
 
 			<view class="home-bgi">
-				<swiper class="swiper" autoplay="1500" :indicator-dots="true" :circular='true'
+			<view style="display: flex;">
-					indicator-active-color="#ffffff" indicator-color="#cccccc">
+				<view class="top">
-					<swiper-item class="swiper-wrap" v-for="(item,index) in banners" :key='index'
+					<view style="font-size: 12px;">报名数量</view>
-						@tap="toGoodsInfo(item.url)">
+					<view style="font-size: 24px;margin-top: 5px;">111</view>
-						<image :src="item.imageUrl"></image>
+				</view>
-					</swiper-item>
+				<view class="picture">
-				</swiper>
+					<image src="../../static/img/home/money.png" style="width: 128px;height: 104.09px;"></image>
+				</view>
+			</view>
+			<view style="display: flex;color: #FFFFFF;" class="bottom">
+				<view class="item">
+					<view style="margin-bottom: 5px;">提交任务数</view>
+					<view>111</view>
+				</view>
+				<view class="item">
+					<view style="margin-bottom: 5px;">审核通过订单</view>
+					<view>111</view>
+				</view>
+				<view class="item">
+					<view style="margin-bottom: 5px;">返利金额</view>
+					<view>111</view>
+				</view>
+			</view>
 			</view>
 
 			<view class="header_cont">
+				<view class="title">订单查询</view>
+				<view class="line"></view>
 				<view class="header_datas" v-for="(item,index) in headerData" :key="index">
 					<view class="numbers">{{item.num}}</view>
 					<view class="shuoming">{{item.name}}</view>
 				</view>
 			</view>
 		</view>
-		<view class="conters">
+		<!-- <view class="conters">
 			<view class="title">活动数据</view>
 			<view class="dosj">
 				<view class="dosj_cont" v-for="(item,index) in activityData" :key="index">
@@ -62,7 +79,7 @@
 						<view class="hdsj">{{item.num}}</view>
 						<view class="hdsj_sm">{{item.name}}</view>
 					</view> -->
-					<view v-for="(item,index) in zhangdanData" :key="index" @tap="goOrder">
+					<!-- <view v-for="(item,index) in zhangdanData" :key="index" @tap="goOrder">
 						<view style="display: flex;width: 100%;padding: 30rpx;align-content: center;">
 							<view style="width: 45%;text-align: left;">
 								<view class="hdsj">{{item.name}}</view>
@@ -77,7 +94,7 @@
 						</view>
 					</view>
 				</view>
-			</view>
+			</view> --> 
 			<view style="margin-top: 40rpx;" v-if="options1.length > 0">
 				<view class="title">店铺管理</view>
 				<view class="shopList" v-for="(item,index) in options1">
@@ -115,11 +132,15 @@
 				endDate: 0,
 				title: '暂无店铺',
 				headerData: [{
-						name: '返利金额', //fanLiMoney
+						name: '今日预估金额', //fanLiMoney
+						num: 0
+					},
+					{
+						name: '已出订单', //shenHeCount
 						num: 0
 					},
 					{
-						name: '审核通过订单', //shenHeCount
+						name: '未出订单', //shenHeCount
 						num: 0
 					}
 				],
@@ -501,7 +522,33 @@
 	.home-bgi {
 		width: 100%;
 		height: 260rpx;
-		background: #FFF;
+		background: linear-gradient(48deg, #FF5656 0%, #FF9F74 100%);
+		opacity: 1;
+		border-radius: 8px;
+		
+		.top{
+			margin-top: 10px;
+			margin-left: 10px;
+			color: #FFFFFF;
+		}
+		
+		.picture{
+		position: absolute;
+		top:45px;
+		right:20px;
+		}
+		
+		.bottom{
+			margin-left: 10px;
+			color: #FFFFFF;
+			font-size: 14px;
+			margin-top: 20px;
+			
+			.item{
+				margin-right: 30px;
+			}
+		}
+		
 
 		.swiper {
 			width: 100%;
@@ -534,7 +581,7 @@
 	.container {
 		.header {
 			width: 100%;
-			background: #FFFFFF;
+			background:#F5F5F5;
 			padding: 30rpx;
 
 			.header_Left {
@@ -589,39 +636,70 @@
 
 			.header_Right {
 				// float: right;
-				width: 20%;
+				width: 111px;
-				text-align: center;
+				height: 32px;
-				font-size: 26rpx;
+				background: #FFFFFF;
-				height: 120rpx;
+				opacity: 1;
-				padding: 20rpx 0;
+				border-radius: 20px 0px 0px 20px;
 				position: absolute;
 				right: 0;
-				top: 0;
+				top: 10px;
 				z-index: 999999;
 
 				.showaddImg {
-					width: 50rpx;
+					width: 21px;
-					height: 50rpx;
+					height: 21px;
+					margin-top: 5px;
+					margin-left: 10px;
+				}
+				
+				.showAdd{
+					position: absolute;
+					top:8px;
+					right: 20px;
+					font-size: 12px;
+					font-family: PingFang SC;
+					font-weight: 500;
+					line-height: 17px;
+					color: #FF605A;
 				}
 			}
 
 			.header_cont {
 				clear: both;
-				background-color: #FF4701;
+				background-color: #FFFFFF;
 				width: 100%;
 				border-radius: 10rpx;
-				height: 100rpx;
+				height: 120px;
 				margin-top: 20rpx;
-				color: #FFFFFF;
+				color:#333333;
+				
+				.title{
+					font-size: 16px;
+					font-family: PingFang SC;
+					font-weight: 500;
+					line-height: 22px;
+					color: #333333;
+					padding: 13px;
+				}
+				
+				.line{
+					height: 1px;
+					background-color: #999999;
+					width: 100%;
+					opacity: 0.22;
+				}
 
 				.header_datas {
 					display: inline-block;
-					width: 50%;
+					width: 110px;
 					text-align: center;
 					padding: 10rpx 0;
+					padding-left: 20px;
 
 					.numbers {
 						font-size: 40rpx;
+						color: #FF605A;
 					}
 				}
 			}

pages/my/index.vue

@@ -14,40 +14,37 @@
 						</view>
 						<view class="phones" v-if="phone">{{phone.substr(0,4)}}****{{phone.substr(8,11)}}</view>
 					</view>
-
 					<view class="noLogin" @tap="checkLogin()" v-else>登录</view>
 				</view>
 			</view>
 
 			<view class="info-jifen">
-				<view class="wdjf">账户资金</view>
 				<view class="shouye_item">
 					<view class="shouye_item_left" @tap="myMoneyMessage">
-						<view class="shouye_item_money"><span style="font-size: 28rpx;">¥</span>{{myMoney}}</view>
 						<view class="shouye_item_text">账户余额</view>
+						<view class="shouye_item_money"><span style="font-size: 28rpx;">¥</span>{{myMoney}}</view>
 					</view>
 					<view class="shouye_item_center" @tap="moneyMessage">
-						<view class="shouye_item_money"><span style="font-size: 28rpx;">¥</span>{{money}}</view>
 						<view class="shouye_item_text">不可用金额</view>
+						<view class="shouye_item_money"><span style="font-size: 28rpx;">¥</span>{{money}}</view>
 					</view>
 					<view class="shouye_item_right" @tap="cashMoneyMessage">
-						<view class="shouye_item_money"><span style="font-size: 28rpx;">¥</span>{{cashMoney}}</view>
 						<view class="shouye_item_text">可用金额</view>
-
+						<view class="shouye_item_money"><span style="font-size: 28rpx;">¥</span>{{cashMoney}}</view>
 					</view>
-
 				</view>
+				<view class="line"></view>
 				<view class="tuandui_item">
 					<view class="shouye_item_left" @tap="goPageLogin('/pages/my/recharge')">
-						<image class="shouye_item_img" src="../../static/img/my/zhcz.png"></image>
+						<image class="shouye_item_img" src="../../static/img/my/chongzhi.png"></image>
 						<view class="shouye_item_text">账户充值</view>
 					</view>
 					<view class="shouye_item_center" @tap="goPageLogin('/pages/my/withdrawal')">
-						<image class="shouye_item_img" src="../../static/img/my/yetx.png"></image>
+						<image class="shouye_item_img" src="../../static/img/my/tixian.png"></image>
 						<view class="shouye_item_text">余额提现</view>
 					</view>
 					<view class="shouye_item_right" @tap="goPageLogin('/pages/my/balanceHistory')">
-						<image class="shouye_item_img" src="../../static/img/my/yels.png"></image>
+						<image class="shouye_item_img" src="../../static/img/my/lishi.png"></image>
 						<view class="shouye_item_text">余额历史</view>
 					</view>
 				</view>
@@ -57,35 +54,35 @@
 			<view class="integrals-box">
 				<view class="integral" @tap="goPageLoginByMerchant('/pages/my/toExamine')">
 					<view class="left">
-						<image src="../../static/img/my/spsh.png"></image>
+						<image src="../../static/img/my/dingdan.png"></image>
 						<text>我的订单</text>
 					</view>
 					<text class="right cuIcon-right"></text>
 				</view>
 				<view class="integral" @tap="goPageLoginByMerchant('/pages/my/myshop')">
 					<view class="left">
-						<image src="../../static/img/my/wddp.png"></image>
+						<image src="../../static/img/my/dianpu.png"></image>
 						<text>我的店铺</text>
 					</view>
 					<text class="right cuIcon-right"></text>
 				</view>
 				<view class="integral" @tap="goPageLoginByMerchant('../activity/index')">
 					<view class="left">
-						<image src="../../static/img/my/hdgl.png"></image>
+						<image src="../../static/img/my/huodong.png"></image>
 						<text>活动管理</text>
 					</view>
 					<text class="right cuIcon-right"></text>
 				</view>
-				<view class="integral" @tap="goPageLogin('/pages/my/cooperation')">
+				<!-- <view class="integral" @tap="goPageLogin('/pages/my/cooperation')">
 					<view class="left">
 						<image src="../../static/img/my/dlhz.png"></image>
 						<text>代理合作</text>
 					</view>
 					<text class="right cuIcon-right"></text>
-				</view>
+				</view> -->
 				<view class="integral" @tap="goPageLogin('/pages/my/customer')">
 					<view class="left">
-						<image src="../../static/img/my/lxkf.png"></image>
+						<image src="../../static/img/my/lianxikefu.png"></image>
 						<text>联系客服</text>
 					</view>
 					<text class="right cuIcon-right"></text>
@@ -94,42 +91,43 @@
 			<view class="integrals-box">
 				<view class="integral" @tap="goPageLogin('/pages/my/account?className=商家教程')">
 					<view class="left">
-						<image src="../../static/img/my/sjjc.png"></image>
+						<image src="../../static/img/my/jiaocheng.png"></image>
 						<text>商家教程</text>
 					</view>
 					<text class="right cuIcon-right"></text>
 				</view>
-				<view class="integral" v-if="userId" @tap='loginOut()'>
+				<!-- <view class="integral" v-if="userId" @tap='loginOut()'>
 					<view class="left">
 						<image src="../../static/img/my/qwyhd.png"></image>
 						<text>前往用户端</text>
 					</view>
 					<text class="right cuIcon-right"></text>
-				</view>
+				</view> -->
 				<view class="integral">
 					<view class="left">
-						<image src="../../static/img/my/fenxiang.png"></image>
+						<image src="../../static/img/my/share.png"></image>
-						<button open-type="share" style="background: #FFFFFF;border: none;padding-left: 34rpx;font-size: 30rpx;font-weight: 500;">分享给其他商家</button>
+						<button open-type="share"
+							style="background: #FFFFFF;border: none;padding-left: 34rpx;font-size: 30rpx;font-weight: 500;">分享给其他商家</button>
 					</view>
 					<text class="right cuIcon-right"></text>
 				</view>
 				<view class="integral" @tap="goPageLogin('/pages/my/account?className=关于我们')">
 					<view class="left">
-						<image src="../../static/img/my/gywm.png"></image>
+						<image src="../../static/img/my/about.png"></image>
 						<text>关于我们</text>
 					</view>
 					<text class="right cuIcon-right"></text>
 				</view>
 				<view class="integral" @tap="goPageLogin('/pages/member/feedback')">
 					<view class="left">
-						<image src="../../static/img/my/fankui.png"></image>
+						<image src="../../static/img/my/yjfk.png"></image>
 						<text>意见反馈</text>
 					</view>
 					<text class="right cuIcon-right"></text>
 				</view>
 			</view>
 		</view>
-		
+
 		<view v-if="Companyname"
 			style="width: 100%;text-align: center;color: #555555;font-size: 26rpx;font-weight: 500;"
 			@tap="toGoodsInfo(CompanylinkUrl)">{{Companyname}}</view>
@@ -143,12 +141,12 @@
 				avatar: "/static/img/logo.jpg",
 				member: 0,
 				total: 0,
-				tuiguang:'',
+				tuiguang: '',
-				backgroundImageUrl:'',
+				backgroundImageUrl: '',
 				CompanylinkUrl: '',
 				Companyname: '',
 				userId: '',
-				shopcourse:'',
+				shopcourse: '',
 				nickName: "",
 				isStudent: -1,
 				MerchantList: 0,
@@ -179,7 +177,7 @@
 		onShow() {
 			this.CompanylinkUrl = this.$queue.getData('151Url');
 			this.Companyname = this.$queue.getData('152name');
-			
+
 			let avatar = this.$queue.getData('avatar');
 			if (avatar && avatar !== 'undefined') {
 				this.avatar = avatar;
@@ -198,7 +196,7 @@
 			} else {
 				this.invitationCode = '';
 			}
-			
+
 			let that = this;
 			that.$Request.getT('/common/type/147').then(res => {
 				if (res.code == 0) {
@@ -214,7 +212,7 @@
 					}
 				}
 			});
-			
+
 			this.sex = this.$queue.getData('sex');
 			this.userId = this.$queue.getData('userId');
 			if (this.userId) {
@@ -230,7 +228,7 @@
 				let token = this.$queue.getData('token');
 				let userId = this.$queue.getData('userId');
 				if (token) {
-					if(!url){
+					if (!url) {
 						return;
 					}
 					if (url.indexOf('/pages/') !== -1) {
@@ -276,13 +274,14 @@
 				});
 			},
 			getShopList(userId) {
-				this.$Request.getT('/goodsMerchant/selectGoodsMerchantPage?page=1&limit=10&userId=' + userId + '&status=2').then(res => {
+				this.$Request.getT('/goodsMerchant/selectGoodsMerchantPage?page=1&limit=10&userId=' + userId + '&status=2')
-					if (res.code == 0) {
+					.then(res => {
-						if (res.data.records.length > 0) {
+						if (res.code == 0) {
-							this.$queue.setData('merchantId', res.data.records[0].merchantId);
+							if (res.data.records.length > 0) {
+								this.$queue.setData('merchantId', res.data.records[0].merchantId);
+							}
 						}
-					}
+					});
-				});
 			},
 			checkMerchant(userId) {
 				this.$Request.getT('/goodsMerchant/selectGoodsMerchantList?userId=' + userId + '&status=1').then(res => {
@@ -516,7 +515,7 @@
 
 		.header {
 			width: 100%;
-			height: 600rpx;
+			height: 500rpx;
 			display: block;
 			position: relative;
 			// background: #fff;
@@ -533,11 +532,11 @@
 				height: 425rpx;
 				position: absolute;
 				z-index: 15;
-				padding: 100upx 30upx 0;
+				padding: 0 30upx;
 				display: flex;
 				align-items: center;
 				// background: #FF4701;
-				background-image: url(../../static/img/my/myuser.png);
+
 				background-size: 100%;
 
 				.user-info-box {
@@ -567,7 +566,7 @@
 						margin-left: 20rpx;
 						font-size: 40upx;
 						font-weight: 800;
-						color: #FEFEFE;
+						color: #333333;
 					}
 
 					.user-info {
@@ -587,7 +586,7 @@
 								height: 38upx;
 								line-height: 38upx;
 								font-weight: 800;
-								color: #fff;
+								color:#333333;
 							}
 
 							.nick_image {
@@ -611,7 +610,7 @@
 						}
 
 						.phones {
-							color: #fff;
+							color:#333333!important;
 							margin-top: 15rpx;
 						}
 
@@ -647,10 +646,10 @@
 				width: 92%;
 				height: 360rpx;
 				position: absolute;
-				background: #fff;
+				background: linear-gradient(50deg, #FF4848 0%, #FF6E6E 100%);
 				border-radius: 15rpx;
 				z-index: 15;
-				margin: 235upx 30upx 0;
+				margin: 120upx 30upx 0;
 				padding: 20upx;
 				box-sizing: border-box;
 				box-shadow: 0 0 3px 1px #ccc;
@@ -659,28 +658,34 @@
 					margin-top: 10rpx;
 					font-size: 34rpx;
 					font-weight: 400;
-					color: #806C30;
+					color: #FFFFFF;
+				}
+				
+				.line{
+					height: 1px;
+					background-color: #FFFFFF;
+					margin-top: 20px;
 				}
 
 				.shouye_item {
 					margin-top: 20rpx;
 					display: flex;
 					width: 100%;
-					color: #333333;
+					color: #FFFFFF;
 					// text-align: justify;
 					text-align: center;
 					padding: 0rpx 20rpx;
 					justify-content: space-between;
 
 					.shouye_item_text {
-						color: #806C30;
+						color: #FFFFFF;
 						font-size: 24rpx;
 					}
 
 					.shouye_item_money {
 						margin-top: 10rpx;
-						font-size: 38rpx;
+						font-size: 20px;
-						color: #FF4701;
+						color: #FFFFFF;
 					}
 
 					.shouye_item_left {
@@ -732,7 +737,7 @@
 					}
 
 					.shouye_item_text {
-						color: #999;
+						color: #FFFFFF;
 						font-size: 24rpx;
 					}
 

pages/my/myshop.vue

@@ -214,8 +214,9 @@
 			width: 92%;
 			margin: 0 4%;
 			box-sizing: border-box;
-			background: #FF4701;
+			background: #FF2B2B;
 			color: #fff;
+			border-radius: 8px;
 		}
 
 	}

pages/my/toExamine.vue

@@ -15,9 +15,9 @@
 							<image class="logo" :src="merchantLogo"></image>
 						</view>
 						<view class="left_down">
-							<image class="icons1" src="../../static/img/home/datas.png"></image>
+							<image class="icons1" src="../../static/img/home/calendar.png"></image>
-							<view class="times"><span @tap="times(1)" style="text-decoration:underline">{{startTime}}
+							<view class="times"><span @tap="times(1)" >{{startTime}}
-								</span>至<span @tap="times(2)" style="text-decoration:underline">{{endTime}}</span>
+								</span>至<span @tap="times(2)" >{{endTime}}</span>
 							</view>
 							<u-picker mode="time" v-model="show1" title="开始时间" @confirm="times1()" :params="params">
 							</u-picker>

project.config.json

@@ -0,0 +1,69 @@
+{
+    "description": "项目配置文件",
+    "packOptions": {
+        "ignore": []
+    },
+    "setting": {
+        "bundle": false,
+        "userConfirmedBundleSwitch": false,
+        "urlCheck": true,
+        "scopeDataCheck": false,
+        "coverView": true,
+        "es6": true,
+        "postcss": true,
+        "compileHotReLoad": false,
+        "lazyloadPlaceholderEnable": false,
+        "preloadBackgroundData": false,
+        "minified": true,
+        "autoAudits": false,
+        "newFeature": false,
+        "uglifyFileName": false,
+        "uploadWithSourceMap": true,
+        "useIsolateContext": true,
+        "nodeModules": false,
+        "enhance": true,
+        "useMultiFrameRuntime": true,
+        "useApiHook": true,
+        "useApiHostProcess": true,
+        "showShadowRootInWxmlPanel": true,
+        "packNpmManually": false,
+        "enableEngineNative": false,
+        "packNpmRelationList": [],
+        "minifyWXSS": true,
+        "showES6CompileOption": false,
+        "minifyWXML": true
+    },
+    "compileType": "miniprogram",
+    "libVersion": "2.20.2",
+    "appid": "wx5f5b49c361569a10",
+    "projectname": "miniprogram-1",
+    "debugOptions": {
+        "hidedInDevtools": []
+    },
+    "scripts": {},
+    "staticServerOptions": {
+        "baseURL": "",
+        "servePath": ""
+    },
+    "isGameTourist": false,
+    "condition": {
+        "search": {
+            "list": []
+        },
+        "conversation": {
+            "list": []
+        },
+        "game": {
+            "list": []
+        },
+        "plugin": {
+            "list": []
+        },
+        "gamePlugin": {
+            "list": []
+        },
+        "miniprogram": {
+            "list": []
+        }
+    }
+}