bug修复

config/api.js

@@ -1,6 +1,7 @@
 // const WX_API_BASE = 'https://www.qianjiadi.com/'
-// const WX_API_BASE = 'http://ch.jihengcc.cn:17080/'
-const WX_API_BASE = 'https://test.jihengcc.cn/'
+const WX_API_BASE = 'http://ch.jihengcc.cn:17080/'
+// const WX_API_BASE = 'https://test.jihengcc.cn/'
+// const WX_API_BASE = 'https://www.qianjiadi.com/'
 
 module.exports = {
 	//  微信登录

manifest.json

@@ -107,7 +107,7 @@
         /* 小程序特有相关 */
         "appid" : "wx0c8f390063292c1f",
         "setting" : {
-            "urlCheck" : true
+            "urlCheck" : false
         },
         "optimization" : {
             "subPackages" : true

pages.json

@@ -170,7 +170,7 @@
 			"pagePath": "pages/media/index",
 			"iconPath": "static/images/icon-media.png",
 			"selectedIconPath": "static/images/icon-media-active.png",
-			"text": "多媒体"
+			"text": "直播"
 		}, {
 			"pagePath": "pages/user/index",
 			"iconPath": "static/images/icon-mine.png",

pages/index/index.vue

@@ -8,11 +8,11 @@
 				<view class="iconfont iconshangchuan1"></view>
 			</button>
 			<view class="authorize-info">{{userNmae}}</view>
-			<button class="authorize-button" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
+			<!-- <button class="authorize-button" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
 				<view class="button-text">获取手机号</view>
 				<view class="iconfont iconshangchuan1"></view>
 			</button>
-			<view class="authorize-info">{{wxPhoneData? '****************' : ''}}</view>
+			<view class="authorize-info">{{wxPhoneData? '****************' : ''}}</view> -->
 			<view class="authorize-login" @click="getUserInfo">登录</view>
 		</view>{{tipxx}}
 		<u-top-tips ref="uTips"></u-top-tips>

pages/media/index.vue

@@ -11,7 +11,7 @@
 				</view>
 			</view>
 			<view class="media-content">
-				<cover-image class="live-card" src="../../static/images/live-card.png" @click="goToLiveDetail"></cover-image>
+				<image class="live-card" src="../../static/images/live-card.png" @click="goToLiveDetail"></image>
 			</view>
 		</view>
 		<view class="media-card">
@@ -29,7 +29,7 @@
 			</view>
 			<view class="media-content">
 				<view class="video-card" v-for="(item, index) in list" :key="index" @click="goToVideo(item)">
-					<cover-image class="video-img" :src="item.coverUrl"></cover-image>
+					<image class="video-img" :src="item.coverUrl"></image>
 					<view class="video-title-box">
 						<text class="iconfont" :class="item.check ? 'iconqueding' : 'iconfeigouxuan'" @click.stop="item.check = !item.check"
 						 v-if="manageType"></text>

pages/user/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="user-info-box">
-			<cover-image class="user-image" :src="userData.headImage"></cover-image>
+			<image class="user-image" :src="userData.headImage"></image>
 			<view class="user-info">
 				<view class="user-logoin-title">{{userData.userName}}</view>
 				<view class="user-type">
@@ -30,24 +30,24 @@
 		</view>
 		<view class="cell-group">
 			<view class="item-btn" @click="pickClick()">
-				<view class="iconfont icondizhiguanli item-btn-icon"></view>
+				<view class="iconfont iconcaizhai item-btn-icon"></view>
 				<view class="item-btn-text">自助采摘</view>
 				<view class="iconfont iconfangxiang"></view>
 			</view>
 			<view class="item-btn" @click="authorizeClick()" v-if="userData.isMaster">
-				<view class="iconfont iconguanyu item-btn-icon"></view>
+				<view class="iconfont iconquanxian item-btn-icon"></view>
 				<view class="item-btn-text">授权</view>
 				<view class="iconfont iconfangxiang"></view>
 			</view>
 			<view class="item-btn" @click="couponClick()">
-				<view class="iconfont iconguanyu item-btn-icon"></view>
+				<view class="iconfont iconyouhuiquan item-btn-icon"></view>
 				<view class="item-btn-text">优惠券管理</view>
 				<view class="iconfont iconfangxiang"></view>
 			</view>
 		</view>
 		<view class="cell-group">
 			<view class="item-btn" @click="infoClick()">
-				<view class="iconfont icondizhiguanli item-btn-icon"></view>
+				<view class="iconfont icondianpu item-btn-icon"></view>
 				<view class="item-btn-text">商户信息</view>
 				<view class="iconfont iconfangxiang"></view>
 			</view>

pagesGood/goodForm.vue

@@ -2,7 +2,7 @@
 	<view class="container">
 		<u-cell-group class="form-info" :border="false">
 			<u-field label="商品名称" placeholder="请输入商品名称" :disabled="ifEdit()" label-width="180" v-model="goodInfo.productName"></u-field>
-			<u-cell-item :title="'请上传商品图片（' + fileList.length + '/5）'" :arrow="false">
+			<u-cell-item title="请上传商品图片(上限5张)" :arrow="false">
 				<view slot="label">
 					<u-image width="98px" height="98px" border-radius="5px" v-for="(item, index) in fileList" :src="item" class="good-img"
 					 v-if="ifEdit()"></u-image>
@@ -11,20 +11,20 @@
 				</view>
 			</u-cell-item>
 			<u-cell-item title="原价" :arrow="false">
-				<u-number-box :positive-integer="false" :min="0" v-model="goodInfo.originalPrice" bg-color="#51A539" color="#ffffff"
+				<u-number-box :positive-integer="false" :min="0" step="1" v-model="goodInfo.originalPrice" bg-color="#51A539" color="#ffffff"
 				 :disabled="ifEdit()" digit></u-number-box>
 			</u-cell-item>
 			<u-cell-item :title="formType == 1 ? '售价' : '采摘价格'" :arrow="false" v-if="formType != 2">
 				<u-number-box :positive-integer="false" :min="0" v-model="goodInfo.bizPrice" bg-color="#51A539" color="#ffffff"
-				 :disabled="ifEdit()"></u-number-box>
+				 :disabled="ifEdit()" digit></u-number-box>
 			</u-cell-item>
 			<u-cell-item title="起拍价" :arrow="false" v-if="formType == 2">
 				<u-number-box :positive-integer="false" :min="0" v-model="goodInfo.auctionStartPrice" bg-color="#51A539" color="#ffffff"
-				 :disabled="ifEdit()"></u-number-box>
+				 :disabled="ifEdit()" digit></u-number-box>
 			</u-cell-item>
 			<u-cell-item title="每次最低加价金额" :arrow="false" v-if="formType == 2">
 				<u-number-box :positive-integer="false" :min="0" v-model="goodInfo.auctionMinAddPrice" bg-color="#51A539" color="#ffffff"
-				 :disabled="ifEdit()"></u-number-box>
+				 :disabled="ifEdit()" digit></u-number-box>
 			</u-cell-item>
 			<u-field label="计量单位" placeholder="请输入计量单位" label-width="180" v-model="goodInfo.unit" :disabled="ifEdit()"></u-field>
 			<u-cell-item title="库存" :arrow="false">
@@ -41,6 +41,7 @@
 		<u-picker mode="time" v-model="dateShow" :start-year="startYear" :params="params" @confirm="setDate"></u-picker>
 		<u-select v-model="selectShow" mode="mutil-column-auto" :list="sortList" @confirm="setSort"></u-select>
 		<u-top-tips ref="uTips"></u-top-tips>
+		<u-keyboard mode="number" v-model="keyboardShow" @change="valChange" @backspace="backspace"></u-keyboard>
 	</view>
 </template>
 
@@ -85,6 +86,7 @@
 				uploadUrl: '',
 				fileList: [],
 				defaultList: [],
+				keyboardShow: false
 			}
 		},
 		onLoad(options) {
@@ -253,6 +255,20 @@
 					})
 				}
 			},
+			// 按键被点击(点击退格键不会触发此事件)
+			valChange(val) {
+				// 将每次按键的值拼接到value变量中，注意+=写法
+				this.goodInfo.originalPrice += val;
+				console.log(this.goodInfo.originalPrice);
+			},
+			// 退格键被点击
+			backspace() {
+				// 删除value的最后一个字符
+				if(this.goodInfo.originalPrice.length)  {
+				   this.goodInfo.originalPrice = this.goodInfo.originalPrice.substr(0, this.goodInfo.originalPrice.length - 1);
+				}
+				console.log(this.goodInfo.originalPrice);
+			}
 		},
 	}
 </script>

pagesGood/goodItem.vue

@@ -4,7 +4,7 @@
 			<view class="iconfont" :class="goodData.check ? 'iconqueding' : 'iconfeigouxuan'" @click="checkGood()"></view>
 		</view>
 		<view class="good-card" :style="{width: manageType ? 'calc(100% - 60px)' : ''}" @click="goToGoodDetail()">
-			<cover-image class="goods-img" :src="goodData.imgPath"></cover-image>
+			<image class="goods-img" :src="goodData.imgPath"></image>
 			<view class="good-info">
 				<view class="good-type">{{goodData.productType == 1 ? '普通商品' : (goodData.productType == 2 ? '拍卖商品' : '自主采摘')}}</view>
 				<view class="good-name">{{goodData.productName}}</view>

pagesMain/authorizeForm.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<view class="authorize-head">
-			<cover-image class="authorize-image" :src="userInfo.merchantImg"></cover-image>
+			<image class="authorize-image" :src="userInfo.merchantImg"></image>
 			<view class="authorize-info">
 				<view class="authorize-name">{{userInfo.merchantNickname}}</view>
 				<view class="authorize-phone">{{userInfo.merchantPhone}}</view>

pagesMain/authorizeList.vue

@@ -3,7 +3,7 @@
 		<view class="authorize-head">授权用户</view>
 		<view class="authorize-box">
 			<view class="authorize-card" v-for="(item, index) in authorizeList" :key="index" @click="handleAuthorize(item)">
-				<cover-image class="authorize-image" :src="item.merchantImg"></cover-image>
+				<image class="authorize-image" :src="item.merchantImg"></image>
 				<view class="authorize-info">
 					<view class="authorize-name">{{item.merchantNickname}}</view>
 					<view class="authorize-phone">{{item.merchantPhone}}</view>
@@ -12,8 +12,8 @@
 					<text class="iconfont iconfangxiang"></text>
 				</view>
 			</view>
-			<u-divider :style="{marginTop : authorizeList.length ? '' : '80px'}" :color="isOver ? '#909399' : '#51A539'"
-			 :border-color="isOver ? '#909399' : '#51A539'" @click="handleLoadMore()">
+			<u-divider :style="{marginTop : authorizeList.length ? '' : '80px'}" :color="isOver ? '#ffffff' : '#51A539'"
+			 :border-color="isOver ? '#ffffff' : '#51A539'" @click="handleLoadMore()">
 				<u-loading mode="circle" v-if="loadingData"></u-loading>{{loadingData ? '加载中' : (isOver ? '没有更多了' : '点击加载更多')}}
 			</u-divider>
 		</view>

pagesMain/evaluateForm.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<view class="assess-row">
-			<cover-image class="assess-head" :src="evaluateData.headimg"></cover-image>
+			<image class="assess-head" :src="evaluateData.headimg"></image>
 			<view class="assess-info">
 				<view class="assess-name">{{evaluateData.nickname}}</view>
 				<view class="assess-date">{{evaluateData.evaluateTime}}</view>
@@ -10,7 +10,7 @@
 				</view>
 				<view class="assess-text">{{evaluateData.evaluateContent}}</view>
 				<view class="assess-img-box">
-					<cover-image class="img-col" v-for="site in evaluateData.evaluateImgs" :key="site" :src="site.imgUrl"></cover-image>
+					<image class="img-col" v-for="site in evaluateData.evaluateImgs" :key="site" :src="site.imgUrl"></image>
 				</view>
 			</view>
 		</view>

pagesMain/messageList.vue

@@ -2,13 +2,13 @@
 	<view class="container">
 		<scroll-view class="message-list-box" scroll-y="true" @scrolltolower="handleLoadMore()">
 			<view class="message-row" v-for="(item, index1) in messageList" :key="index1">
-				<cover-image class="message-head" :src="item.headImg"></cover-image>
+				<image class="message-head" :src="item.headImg"></image>
 				<view class="message-info-box">
 					<view class="message-name">{{item.userName}}</view>
 					<view class="message-date">{{item.leaMsgTime}}</view>
 					<view class="message-text">{{item.leaMsgContent}}</view>
 					<view class="message-img-box" v-for="(site, index2) in item.orderLeaImgResVOs" :key="index2">
-						<cover-image class="message-img" :src="site.imgUrl"></cover-image>
+						<image class="message-img" :src="site.imgUrl"></image>
 					</view>
 				</view>
 			</view>

pagesMain/orderDetail.vue

@@ -23,7 +23,7 @@
 			</view>
 			<view class="goods-list">
 				<view class="goods-row" v-for="(item, index) in orderData.merchantInfoResVO.products" :key="index">
-					<cover-image class="goods-img" :src="item.imgUrl"></cover-image>
+					<image class="goods-img" :src="item.imgUrl"></image>
 					<view class="goods-info">
 						<view class="goods-name">{{item.productName}}</view>
 						<view class="goods-type">
@@ -59,13 +59,13 @@
 			</view>
 			<view class="info-content-box">
 				<view class="message-row" v-for="(item, index1) in orderData.leas" :key="index1">
-					<cover-image class="message-head" :src="item.imgUrl"></cover-image>
+					<image class="message-head" :src="item.imgUrl"></image>
 					<view class="message-info-box">
 						<view class="message-name">{{item.leaMsgType}}</view>
 						<view class="message-date">{{item.leaMsgTime}}</view>
 						<view class="message-text">{{item.leaMsgContent}}</view>
 						<view class="message-img-box" v-for="(site, index2) in item.orderLeaImgResVOs" :key="index2">
-							<cover-image class="message-img" :src="site.imgUrl"></cover-image>
+							<image class="message-img" :src="site.imgUrl"></image>
 						</view>
 					</view>
 				</view>

pagesMain/orderItem.vue

@@ -7,7 +7,7 @@
 		</view>
 		<view class="goods-list" v-if="orderData">
 			<view class="goods-row" v-for="(site, index) in orderData.products" :key="index">
-				<cover-image class="goods-img" :src="site.imgUrl"></cover-image>
+				<image class="goods-img" :src="site.imgUrl"></image>
 				<view class="goods-info">
 					<view class="goods-name">{{site.productName}}</view>
 					<view class="goods-type">

pagesMain/registerForm.vue

@@ -16,13 +16,13 @@
 			</u-cell-item>
 			<u-cell-item title="请上传身份证正反面" :arrow="false">
 				<view slot="label" class="id-card-box">
-					<cover-image class="id-card" :src="shopInfo.idCardCopyFilePath"></cover-image>
-					<cover-image class="id-card" :src="shopInfo.idCardNationalFilePath"></cover-image>
+					<image class="id-card" :src="shopInfo.idCardCopyFilePath"></image>
+					<image class="id-card" :src="shopInfo.idCardNationalFilePath"></image>
 				</view>
 			</u-cell-item>
 			<u-cell-item title="请上传营业执照照片" :arrow="false">
 				<view slot="label" class="license-box">
-					<cover-image class="license-img" :src="shopInfo.businessLicenseCopyFilePath"></cover-image>
+					<image class="license-img" :src="shopInfo.businessLicenseCopyFilePath"></image>
 				</view>
 			</u-cell-item>
 			<u-field label="法人姓名" placeholder="请输入法人姓名" label-width="180" v-model="shopInfo.duty" disabled></u-field>

pagesMedia/liveDetail.vue

@@ -17,7 +17,7 @@
 							<view class="iconfont" :class="item.check ? 'iconqueding' : 'iconfeigouxuan'" @click="checkGoods(item)"></view>
 						</view>
 						<view class="good-card" style="width: calc(100% - 60px);">
-							<cover-image class="goods-img" :src="item.imgPath"></cover-image>
+							<image class="goods-img" :src="item.imgPath"></image>
 							<view class="good-info">
 								<view class="good-name">{{item.productName}}</view>
 								<view class="good-text">销量：{{item.sellCount}}</view>

pagesMedia/videoDetail.vue

@@ -12,7 +12,7 @@
 				<view class="popup-edit" @click="editVideo()">编辑</view>
 				<scroll-view scroll-y="true" class="good-box">
 					<view class="good-card" v-for="(item, index) in goodList" :key="index">
-						<cover-image class="goods-img" :src="item.imgPath"></cover-image>
+						<image class="goods-img" :src="item.imgPath"></image>
 						<view class="good-info">
 							<view class="good-name">{{item.productName}}</view>
 							<view class="good-text">销量：{{item.sellCount}}</view>

pagesMedia/videoForm.vue

@@ -4,7 +4,7 @@
 			<u-field label="视频名称" placeholder="请输入视频名称" label-width="180" v-model="videoInfo.videoName"></u-field>
 			<u-cell-item title="请上传视频" :arrow="false" v-if="type == 'add'">
 				<view slot="label">
-					<cover-image class="video-img" :src="videoImg" v-show="videoImg"></cover-image>
+					<image class="video-img" :src="videoImg" v-show="videoImg"></image>
 					<view class="upload-video" @tap="chooseVideoImage" v-if="!videoImg">
 						<u-icon name="plus" size="40"></u-icon>
 						<view class="u-add-tips" style="margin-top: 6px;">选择视频</view>
@@ -20,7 +20,7 @@
 			<u-cell-item title="绑定商品（可多选）" @click="popupShow = true" class="good-arrow">
 				<view slot="label">
 					<view class="good-card" v-for="(item, index) in goodList.filter(site => site.check)" :key="index">
-						<cover-image class="goods-img" :src="item.imgPath"></cover-image>
+						<image class="goods-img" :src="item.imgPath"></image>
 						<view class="good-info">
 							<view class="good-name">{{item.productName}}</view>
 							<view class="good-text">销量：{{item.sellCount}}</view>
@@ -43,7 +43,7 @@
 						<view class="iconfont" :class="item.check ? 'iconqueding' : 'iconfeigouxuan'"></view>
 					</view>
 					<view class="good-card" style="width: calc(100% - 60px);">
-						<cover-image class="goods-img" :src="item.imgPath"></cover-image>
+						<image class="goods-img" :src="item.imgPath"></image>
 						<view class="good-info">
 							<view class="good-name">{{item.productName}}</view>
 							<view class="good-text">销量：{{item.sellCount}}</view>
@@ -115,6 +115,7 @@
 					count: 1,
 					sourceType: ['camera', 'album'],
 					success: (res) => {
+						console.log(res)
 						this.videoImg = res.thumbTempFilePath
 						uni.uploadFile({
 							url: API.uploadFile,