add:消费者首页判断逻辑修改；商户信息编辑

home.js

@@ -254,7 +254,7 @@ window.onload = function () {
                 }
                 gemhoUtil.setCookie('userType', this.userInfo.userType)
 
-                if (this.userInfo.userType === 'consumers') { // 2025年5月14日新增消费者逻辑
+                /* if (this.userInfo.userType === 'consumers') { // 2025年5月14日新增消费者逻辑
                   // 根据url地址的merid获取商户信息
                   if (gemhoUtil.getParameter('merId')) { // 消费者直接在爱山东扫商户码进入首页
                     // this.getMerInfo()
@@ -278,7 +278,8 @@ window.onload = function () {
                   }
 
                   return
-                } else if (this.userInfo.userType === 'shop') {
+                } else */
+				if (this.userInfo.userType === 'shop') {
                   this.defaultMenuList[1].navTo = 'checkrecord'
                 } else {
                   this.defaultMenuList[1].navTo = 'shanghu_list'

sdk/jssdk2/index.js

@@ -13,14 +13,35 @@ window.onload = function () {
   } else {
     let accessType = gemhoUtil.getParameter('accessType')
     if (accessType == 'saoma') {
-      let param = {
-        accessType: accessType,
-        merId: gemhoUtil.getParameter('merId')
-      }
-      let url = gemhoUtil.setParameter(`./src/_shanghu_home.html`, param)
-      gemhoUtil.navigatePage(url, '跳转中...')
+		let param = {
+		  accessType: accessType,
+		  merId: gemhoUtil.getParameter('merId')
+		}
+		
+		// 2025年5月30日08:45:33 添加消费者访问逻辑
+		console.log('userType', gemhoUtil.getCookie('userType') == 'consumers')
+		var url = ''
+		if(gemhoUtil.getCookie('userType') == 'consumers'){
+			url = gemhoUtil.setParameter(`./src/_consumer_home.html`, param)
+		}else{ // 非消费者
+			url = gemhoUtil.setParameter(`./src/_shanghu_home.html`, param)
+		}
+		console.log('userType-url', url)
+		gemhoUtil.navigatePage(url, '跳转中...')
     } else {
-      gemhoUtil.navigatePage('home.html', '跳转中...')
+		if(gemhoUtil.getCookie('userType') == 'consumers'){
+			vant.Dialog.alert({
+			  title: '信息提示',
+			  message: '请扫描商户码访问~',
+			}).then(() => { // 关闭当前访问页面回到爱山东
+			  lightAppJssdk.navigation.close({
+			    success: function (data) { },
+			    fail: function (data) { },
+			  })
+			});
+		}else{
+			gemhoUtil.navigatePage('home.html', '跳转中...')
+		}
     }
   }
 }
@@ -100,6 +121,32 @@ function getUserInfo() {
               // localStorage.setItem('token', result.token)
               if (result.code == 200) {
                 gemhoUtil.setCookie('token', result.token, 1) // 存储1天后过期
+				
+				// 2025-5-30 08:54:47 新增消费者判断逻辑
+				gemhoUtil.setCookie('userType', 'consumers') // 存储1天后过期
+				
+				if(gemhoUtil.getCookie('userType') == 'consumers'){
+					let merId = gemhoUtil.getParameter('merId')
+					if(!merId){
+						vant.Dialog.alert({
+						  title: '信息提示',
+						  message: '请扫描商户码访问~',
+						}).then(() => { // 关闭当前访问页面回到爱山东
+						  lightAppJssdk.navigation.close({
+						    success: function (data) { },
+						    fail: function (data) { },
+						  })
+						});
+						return
+					}
+					// 消费者扫码访问 添加逻辑 merId传参
+					let param = {
+					  merId
+					}
+					let url = gemhoUtil.setParameter(`src/_consumer_home.html`, param)
+					gemhoUtil.navigatePage(url, '跳转中...')
+					return
+				}
                 gemhoUtil.navigatePage('home.html', '跳转中...')
               } else {
                 vant.Dialog.alert({

src/_shanghu_detail-edit.html

@@ -131,34 +131,58 @@
 					</div>
 					<div>
 						<h5 class="imager-item-title">
-							<span>请上传门头图片</span>
+							<span>门头图片</span>
 							<span></span>
 						</h5>
-						<div>
+						<div v-if="flag=='XG'">
 							<van-uploader v-model="formData.storefrontPhotosH5" :max-count="4"
 								:after-read="handleFileUpload" class="uploader-wrapper" />
 						</div>
+						<div v-if="flag=='XQ'">
+						  <img
+						    v-for="(imgItem, subIndex) in formData.storefrontPhotos"
+						    :src="imgItem"
+						    alt=""
+						    style="width: 1.2rem; height: 1.2rem; margin-right: 0.2rem"
+						  />
+						</div>
 					</div>
 				
 					<div>
 						<h5 class="imager-item-title">
-							<span>请上传营业执照图片</span>
+							<span>营业执照图片</span>
 							<span></span>
 						</h5>
-						<div>
+						<div v-if="flag=='XG'">
 							<van-uploader v-model="formData.businessLicensePhotosH5" :max-count="1"
 								:after-read="handleFileUpload" class="uploader-wrapper" />
 						</div>
+						<div v-if="flag=='XQ'">
+						  <img
+						    v-for="(imgItem, subIndex) in formData.businessLicensePhotos"
+						    :src="imgItem"
+						    alt=""
+						    style="width: 1.2rem; height: 1.2rem; margin-right: 0.2rem"
+						  />
+						</div>
 					</div>
 					<div>
 						<h5 class="imager-item-title">
-							<span>请上传平面图片</span>
+							<span>平面图片</span>
 							<span></span>
 						</h5>
-						<div>
+						<div v-if="flag=='XG'">
 							<van-uploader v-model="formData.floorPlanPhotosH5" :max-count="1"
 								:after-read="handleFileUpload" class="uploader-wrapper" />
 						</div>
+						<div v-if="flag=='XQ'">
+						  <img
+						    v-for="(imgItem, subIndex) in formData.floorPlanPhotos"
+						    :src="imgItem"
+						    alt=""
+						    style="width: 1.2rem; height: 1.2rem; margin-right: 0.2rem"
+						  />
+						</div>
 					</div>
 					<button v-if="flag=='XG'" class="save-btn" style="margin-left: 50%; transform: translateX(-50%);" @click="save"
 						>保存</button>
@@ -171,7 +195,7 @@
 							<img :src="formData.qrCodeUrl" style="margin-left: 50%; transform: translateX(-50%);" />
 						</div>
 					</div>
-					<button v-if="userType=='shop'" class="save-btn" style="margin-left: 50%; transform: translateX(-50%);" @click="save"
+					<button v-if="userType!=='shop'" class="save-btn" style="margin-left: 50%; transform: translateX(-50%);" @click="saveCanvas"
 						>保存二维码</button>
 				</div>
 				<!-- form结束 -->