支付键盘

components/amountInput/amountInput.vue

@@ -23,13 +23,13 @@
 				<view class='key-cell last-child '></view>
 			</view>
 			<view class="key-zero-and-point" v-if="isShow">
-				<view class="a zero" @click.stop='_handleKeyPress(0)'>0</view>
-				<view class="a point" @click.stop="_handleKeyPress('.')">.</view>
+				<view class="a zero key-cell-num" @click.stop='_handleKeyPress(0)'>0</view>
+				<view class="a point key-cell-num" @click.stop="_handleKeyPress('.')">.</view>
 				<view class='a last-child'>
 				</view>
 			</view>
 
-			<view class='key-confirm' :class="{big:isShow,frist:fristShow}" :style="{'background':btnColor}"
+			<view class='key-confirm key-cell-num' :class="{big:isShow,frist:fristShow}" :style="{'background':btnColor}"
 				@click.stop="_handleKeyPress('confirm')">
 				{{confirmText}}
 			</view>
@@ -38,7 +38,7 @@
 				<view class="" style="height: 90rpx;"></view>
 				<view  class="footer-fixed center" style="bottom: 14%;">
 					<view @click="_handleKeyPress('confirm')" class="cu-btn df radius " :style="{'background':btnColor}" style="color: #FFFFFF;width: 90%;height: 90rpx;">
-						付款
+						{{confirmText}}
 					</view>
 				</view>
 			</view>
@@ -68,7 +68,7 @@
 				type: String
 			},
 			maxNumber: {
-				default: 100000000000,
+				default: 10000000,
 				type: Number
 			},
 			fontSize: {

manifest.json

@@ -57,7 +57,12 @@
             "postcss" : true,
             "minified" : true
         },
-        "usingComponents" : true
+        "usingComponents" : true,
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "您的位置信息将用于店铺注册"
+            }
+        }
     },
     "mp-alipay" : {
         "usingComponents" : true

pages/bill/bill.vue

@@ -87,7 +87,7 @@
 									:src="item.userAvator?item.userAvator:'/static/icon/avatar.png'" mode="aspectFit">
 								</image>
 								<view class="margin-left-10">
-									<text>{{item.userName || '微信支付'}}</text>
+									<text>{{item.userName || '用户支付'}}</text>
 									<text>{{item.updateTime}}</text>
 								</view>
 							</view>

pages/pay/pay.vue

@@ -14,7 +14,7 @@
 				</view>
 			</view>
 		</view>
-		<amountInput ref="amountInput"  confirmText="付款" btnColor="#ff9900"
+		<amountInput ref="amountInput"  confirmText="收款" btnColor="#ff9900"
 			placeholder="请输入交易金额" @change="change"
 			@confirm="scanCode"></amountInput>
 	</view>

pages/shop-info/shop-info.vue

@@ -12,7 +12,7 @@
 				</view>
 				<view class="border">
 					<u-form-item label="所在商场" prop="phone">
-						<u-input @click="mallShow=true" :border="false" placeholder="请选择所在商场"  v-model="mallLabel"
+						<u-input @click="mallShow=true" :border="false" placeholder="请选择所在商场(非必填项)"  v-model="mallLabel"
 							type="select"></u-input>
 							<u-icon class="clear" color="#999" v-if="mallLabel" name="close-circle-fill" @click.stop="clear('mallLabel')"></u-icon>
 					</u-form-item>
@@ -52,7 +52,7 @@
 					<view class="box">
 						<view @click="chooseImage('idCardFront')" class="flex flex-direction">
 							<upload-img width="430" height="260"
-								:currentImage="form.idCardFront" bgsrc="/static/icon/photo.png">
+								:currentImage="form.idCardFront" bgsrc="https://guosen-bucket-ldt.obs.cn-south-1.myhuaweicloud.com/b1ca068b8f8b42b7813b275d38bbbbb0-vdjRu9BmUyuN480b6cf029f9df431762ca9bf2f8da95.png">
 							</upload-img>
 							<view class="text-center  padding-top-20 btn-color">
 								<text class="cuIcon-camera padding-right-sm" style="font-size: 30rpx;"></text>
@@ -64,7 +64,7 @@
 					<view class="box">
 						<view  @click="chooseImage('idCardContrary')" class="flex flex-direction">
 							<upload-img width="430" height="260"
-								:currentImage="form.idCardContrary" bgsrc="/static/icon/photo.png">
+								:currentImage="form.idCardContrary" bgsrc="https://guosen-bucket-ldt.obs.cn-south-1.myhuaweicloud.com/b1ca068b8f8b42b7813b275d38bbbbb0-vdjRu9BmUyuN480b6cf029f9df431762ca9bf2f8da95.png">
 							</upload-img>
 							<view class="text-center  padding-top-20 btn-color">
 								<text class="cuIcon-camera padding-right-sm" style="font-size: 30rpx;"></text>
@@ -144,7 +144,7 @@
 					<u-form-item label="上传营业执照" prop="businessLicense" label-position="top">
 						<view @click="chooseImage('businessLicense')" class="flex-direction center margin-top-30">
 							<upload-img width="480" height="300"
-								:currentImage="form.businessLicense" bgsrc="/static/icon/upload.png">
+								:currentImage="form.businessLicense" bgsrc="https://guosen-bucket-ldt.obs.cn-south-1.myhuaweicloud.com:443/d850b98e0779466a8ec7456bcfca4188-u65cnhFHsPWM78f027b94f73c9e82295c29ace1588e3.png">
 							</upload-img>
 							<view class="text-center  padding-top-20 btn-color">
 								<text class="cuIcon-camera padding-right-sm" style="font-size: 30rpx;"></text>
@@ -158,7 +158,7 @@
 					<u-form-item label="店铺实况" prop="shopPic" label-position="top">
 						<view @click="chooseImage('shopPic')" class="flex-direction center margin-top-30">
 							<upload-img width="480" height="300"
-								:currentImage="form.shopPic" bgsrc="/static/icon/upload.png">
+								:currentImage="form.shopPic" bgsrc="https://guosen-bucket-ldt.obs.cn-south-1.myhuaweicloud.com:443/d850b98e0779466a8ec7456bcfca4188-u65cnhFHsPWM78f027b94f73c9e82295c29ace1588e3.png">
 							</upload-img>
 							<view class="text-center  padding-top-20 btn-color">
 								<text class="cuIcon-camera padding-right-sm" style="font-size: 30rpx;"></text>