diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue index c8fe219..24772e2 100644 --- a/pages/store/settled/index.vue +++ b/pages/store/settled/index.vue @@ -192,59 +192,6 @@ </view> </view> - <!-- <view class="item" v-if="nature_business==1"> - <view class="acea-row row-middle"> - <text class="item-name">对公账号</text> - <input type="number" placeholder="请输入对公账号" v-model="merchantData.bank_code" - @input="validateBtn" placeholder-class='placeholder' /> - </view> - </view> - <view class="item" v-else> - <view class="acea-row row-middle"> - <text class="item-name">银行卡号</text> - <input type="number" placeholder="请输入银行卡号" v-model="merchantData.bank_code" - @input="validateBtn" placeholder-class='placeholder' /> - </view> - </view> - <view class="item"> - <view class="acea-row row-middle"> - <text class="item-name">开户银行</text> - <input type="text" maxlength="30" placeholder="请输入开户银行名称" - v-model="merchantData.bank_username" @input="validateBtn" - placeholder-class='placeholder' /> - </view> - </view> - <view class="item"> - <view class="acea-row row-middle"> - <text class="item-name">开户网点</text> - <input type="text" placeholder="请输入开户网点" v-model="merchantData.bank_opening" - @input="validateBtn" placeholder-class='placeholder' /> - </view> - </view> - <view class="item" v-if="nature_business==2"> - <view class="acea-row row-middle"> - <text class="item-name">持卡人</text> - <input type="text" placeholder="请输入持卡人姓名" v-model="merchantData.bank_card_username" - @input="validateBtn" placeholder-class='placeholder' /> - </view> - </view> - <view class="item no-border" v-if="nature_business==2"> - <view class='acea-row row-middle'> - <text class="item-title" style="margin-right: 20rpx;">请上传银行卡正面照片</text> - <text class="item-desc">(支持JPG、PNG、JPEG)</text> - <view class="upload"> - <view v-if="bank_front" class='pictrue' @click='uploadpicBack'> - <image :src='bank_front'></image> - </view> - <view v-else class='pictrue acea-row row-center-wrapper row-column' - @click='uploadpicBack'> - <text class='iconfont icon-icon25201'></text> - <view>上传图片</view> - </view> - </view> - </view> - </view> --> - <view class="item"> <view class="acea-row row-middle"> <text class="item-name">联系电话</text> diff --git a/utils/uniMPevent.js b/utils/uniMPevent.js index b5b5a53..12bd385 100644 --- a/utils/uniMPevent.js +++ b/utils/uniMPevent.js @@ -3,7 +3,7 @@ import { uniMPgetLocation, test } from "@/utils/uniMPfunction.js" - +console.log(123) export const initEvent = () => { mp.onUniMPEventReceive(async (ret) => { console.log('小程序事件: ', ret); @@ -11,12 +11,19 @@ export const initEvent = () => { // 用户如果没有注册商户 从小程序返回 入驻页面 if (ret.event == 'closeAppToOpenShop') { mp.closeUniMP(ret.fromAppid, (ret) => { - uni.navigateTo({ - url: "/pages/store/settled/index" - }) + setTimeout(() => { + uni.navigateTo({ + url: "/pages/store/settled/index" + }) + }, 200) }); } + // 关闭app + if (ret.event == 'backApp') { + mp.closeUniMP(ret.fromAppid, (ret) => {}); + } + if (ret.event == 'closeApp') { mp.closeUniMP(ret.fromAppid, (ret) => { console.log('closeUniMP: ' + JSON.stringify(ret));