Commit 1ff297e7 authored by xinzhedeai's avatar xinzhedeai

fix:商户码提醒优化,新增特种作业显示处理,上一页。

parent 9808149e
...@@ -113,7 +113,7 @@ window.onload = function() { ...@@ -113,7 +113,7 @@ window.onload = function() {
rev: (+new Date()) rev: (+new Date())
}; };
if (param.merId == null || param.merId == '') { if (param.merId == null || param.merId == '') {
alert('请扫描正确的商家二维码') alert('请扫描正确的商家店面二维码')
return return
} else { } else {
let url = gemhoUtil.setParameter(`./src/_shanghu_home.html`, let url = gemhoUtil.setParameter(`./src/_shanghu_home.html`,
......
...@@ -32,7 +32,7 @@ window.onload = function () { ...@@ -32,7 +32,7 @@ window.onload = function () {
if (gemhoUtil.getCookie('userType') == 'consumers') { if (gemhoUtil.getCookie('userType') == 'consumers') {
vant.Dialog.alert({ vant.Dialog.alert({
title: '信息提示', title: '信息提示',
message: '请扫描商户码访问~', message: '您好,消费者,请用爱山东扫一扫商家店面二维码访问~',
}).then(() => { // 关闭当前访问页面回到爱山东 }).then(() => { // 关闭当前访问页面回到爱山东
lightAppJssdk.navigation.close({ lightAppJssdk.navigation.close({
success: function (data) { }, success: function (data) { },
......
...@@ -327,9 +327,9 @@ ...@@ -327,9 +327,9 @@
<span class="yh_num">{{noCount}} 隐患</span> <span class="yh_num">{{noCount}} 隐患</span>
<van-button v-show="checkPageIndex>0" type="info" plain size="small" <van-button v-show="checkPageIndex>0" type="info" plain size="small"
@click="prevPage">上一</van-button> @click="prevPage">上一</van-button>
<van-button v-show="checkPageIndex<3" type="info" size="small" <van-button v-show="checkPageIndex<3" type="info" size="small"
@click="validRequired">下一</van-button> @click="validRequired">下一</van-button>
<van-button type="info" size="small" @click="add4JC_XQ" <van-button type="info" size="small" @click="add4JC_XQ"
v-show="checkPageIndex===3&&flag=='ADD'">完成检查</van-button> v-show="checkPageIndex===3&&flag=='ADD'">完成检查</van-button>
</div> </div>
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</van-search> </van-search>
</div> </div>
<!-- 功能 --> <!-- 功能 -->
<button v-if="userType!=='shop'" type="info" class="func_btn" @click="viewDetail"><span>+</span>特种作业报备</button> <button v-if="userType=='shop'" type="info" class="func_btn" @click="viewDetail"><span>+</span>特种作业报备</button>
<div class="subNavWrapper"> <div class="subNavWrapper">
<van-list v-model:loading="loading" :offset="10" :finished="finished" finished-text="没有更多了" @load="getList" :immediate-check="false"> <van-list v-model:loading="loading" :offset="10" :finished="finished" finished-text="没有更多了" @load="getList" :immediate-check="false">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment