Browse Source

feat: 订单bug

2912631854@qq.com 1 year ago
parent
commit
4ed2bf7d02
2 changed files with 51 additions and 12 deletions
  1. 27 11
      pagesHouse/Mine/PersonalEditing/PersonalEditing.vue
  2. 24 1
      pagesHouse/Verification/index.vue

+ 27 - 11
pagesHouse/Mine/PersonalEditing/PersonalEditing.vue

@@ -16,10 +16,8 @@
 				<view class="realName">
 					店铺名称
 				</view>
-				<!-- <u--input v-model="realName" border="none" pl ></u--input> -->
 				<view class="right">
-					<!-- <input type="text" v-model="dto.name" border="none" placeholder="请输入昵称" /> -->
-					{{dto.name}}
+					<input type="text" v-model="dto.name" border="none" placeholder="请输入手机号" style="height: 48rpx;" />
 				</view>
 			</view>
 			<view class="one-mobile">
@@ -35,19 +33,16 @@
 					商家地址
 				</view>
 				<view class="right">
-					{{dto.address}}
-					{{dto.address}}
+					<input type="text" v-model="dto.address" border="none" placeholder="请输入" style="height: 48rpx;" />
 				</view>
 
 			</view>
 
-			<view class="one" @click="nav">
+			<!-- 	<view class="one" @click="nav">
 				<view class="">
 					营业执照
 				</view>
-				<view class="">
-					<u-icon name="arrow-right"></u-icon>
-				</view>
+				<input type="text" v-model="dto.creditCode" border="none" placeholder="请输入" style="height: 48rpx;" />
 			</view>
 			<view class="one">
 				<view class="">
@@ -56,11 +51,11 @@
 				<view class="">
 					<u-icon name="arrow-right"></u-icon>
 				</view>
-			</view>
+			</view> -->
 
 		</view>
 
-		<view class="from-content">
+		<!-- <view class="from-content">
 			<view class="title">
 				店铺照片
 			</view>
@@ -68,7 +63,13 @@
 				<image :src='item' v-for="(item,index) in shopImgs" :key="index"></image>
 			</view>
 
+		</view> -->
+		<view class="from-content1">
+			<button class="tenant-button" @click="merchant">
+				立即保存
+			</button>
 		</view>
+
 	</view>
 </template>
 
@@ -147,6 +148,21 @@
 </script>
 
 <style lang="scss" scoped>
+	//保存样式
+	.tenant-button {
+		position: fixed;
+		bottom: 0;
+		background: #007A69;
+		border-radius: 40rpx;
+		font-weight: bold;
+		font-size: 28rpx;
+		color: #FFFFFF;
+		width: 92%;
+		box-sizing: border-box;
+		// padding-bottom: 30rpx;
+		margin-bottom: 30rpx;
+	}
+
 	.page {
 		box-sizing: border-box;
 		padding: 30rpx;

+ 24 - 1
pagesHouse/Verification/index.vue

@@ -36,7 +36,30 @@
 		methods: {
 			// 扫码
 			SweepIt() {
-				this.$showToast('正在开发中...');
+				// this.$showToast('正在开发中...');
+				uni.scanCode({
+					onlyFromCamera: true,
+					success: (res) => {
+						console.log('扫描二维码成功,结果:' + res.result);
+						this.$api.get('/merchant/merchantFisherman/home/getDetails?writeOffCode=' + res.result)
+							.then(res => {
+								if (res.data.code == 0) {
+									this.value = ''
+									uni.setStorageSync('list', res.data.data);
+									uni.navigateTo({
+										url: '/pagesHouse/Verification/details'
+									})
+								} else {
+									this.value = ''
+									this.$showToast(res.data.msg)
+								}
+							})
+					},
+					error: (res) => {
+						console.log('扫描二维码出现错误')
+					}
+				})
+
 			},
 			// 手工
 			handiwork() {