mkm
/
shop-applet
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整功能

This commit is contained in:
weipengfei 2024-03-07 15:48:08 +08:00
parent 350104072f
commit 423e9b8344
3 changed files with 2294 additions and 2416 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/activePopup.vue
View File

@ -43,11 +43,11 @@
getArticleList(28).then(res=>{
if(this.userInfo.mer_info.type_code=='PersonalStore'){
this.info = res.data.list[0];
this.$refs.activityPopup.open();
if(res.data.list[0]) this.$refs.activityPopup.open();
}
else {
this.info = res.data.list[1];
this.$refs.activityPopup.open();
if(res.data.list[1]) this.$refs.activityPopup.open();
}
})
}

143
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "惠农商户平台",
"appid" : "__UNI__1EE148C",
"description" : "",
"versionName" : "1.3.1",
"versionCode" : 131,
"versionName" : "1.3.2",
"versionCode" : 132,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
@ -96,8 +96,9 @@
"sdkConfigs" : {
"maps" : {
"amap" : {
"appkey_ios" : "048d9f3f323eea894b49c3a7edbc8d87",
"appkey_android" : "048d9f3f323eea894b49c3a7edbc8d87"
"appkey_ios" : "0a3202688624938fd5d2f37b52c30d5d",
"appkey_android" : "0354f5ddc11e2ea76c5aac647f44d945",
"name" : "amapIvoVHpJR"
}
},
"payment" : {
@ -114,6 +115,12 @@
}
},
"geolocation" : {
"amap" : {
"name" : "amapIvoVHpJR",
"__platform__" : [ "ios", "android" ],
"appkey_ios" : "0a3202688624938fd5d2f37b52c30d5d",
"appkey_android" : "0354f5ddc11e2ea76c5aac647f44d945"
},
"system" : {
"__platform__" : [ "ios", "android" ]
}
@ -156,134 +163,6 @@
"splashscreen" : {
"useOriginalMsgbox" : true
}
},
"nativePlugins" : {
"JG-JCore" : {
"JPUSH_APPKEY_IOS" : "b5f679f4357018605ea6fd2e",
"JPUSH_CHANNEL_IOS" : "",
"JPUSH_APPKEY_ANDROID" : "b5f679f4357018605ea6fd2e",
"JPUSH_CHANNEL_ANDROID" : "",
"__plugin_info__" : {
"name" : "JG-JCore",
"description" : "极光推送JCore插件",
"platforms" : "Android,iOS",
"url" : "",
"android_package_name" : "uni.UNI3A527D1",
"ios_bundle_id" : "",
"isCloud" : false,
"bought" : -1,
"pid" : "",
"parameters" : {
"JPUSH_APPKEY_IOS" : {
"des" : "[iOS]极光portal配置应用信息时分配的AppKey",
"key" : "JCore:APP_KEY",
"value" : "7869a2f94b120cfb4431b96f"
},
"JPUSH_CHANNEL_IOS" : {
"des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default",
"key" : "JCore:CHANNEL",
"value" : ""
},
"JPUSH_APPKEY_ANDROID" : {
"des" : "[Android]极光portal配置应用信息时分配的AppKey",
"key" : "JPUSH_APPKEY",
"value" : ""
},
"JPUSH_CHANNEL_ANDROID" : {
"des" : "[Android]用于统计分发渠道，不需要可填默认值developer-default",
"key" : "JPUSH_CHANNEL",
"value" : ""
}
}
}
},
"JG-JPush" : {
"JPUSH_ISPRODUCTION_IOS" : "",
"JPUSH_ADVERTISINGID_IOS" : "",
"JPUSH_DEFAULTINITJPUSH_IOS" : "",
"JPUSH_OPPO_APPKEY" : "",
"JPUSH_OPPO_APPID" : "",
"JPUSH_OPPO_APPSECRET" : "",
"JPUSH_VIVO_APPKEY" : "",
"JPUSH_VIVO_APPID" : "",
"JPUSH_MEIZU_APPKEY" : "",
"JPUSH_MEIZU_APPID" : "",
"JPUSH_XIAOMI_APPKEY" : "",
"JPUSH_XIAOMI_APPID" : "",
"__plugin_info__" : {
"name" : "JG-JPush",
"description" : "极光推送Hbuilder插件",
"platforms" : "Android,iOS",
"url" : "",
"android_package_name" : "uni.UNI3A527D1",
"ios_bundle_id" : "",
"isCloud" : false,
"bought" : -1,
"pid" : "",
"parameters" : {
"JPUSH_ISPRODUCTION_IOS" : {
"des" : "[iOS]是否是生产环境，是填true，不是填false或者不填",
"key" : "JPush:ISPRODUCTION",
"value" : ""
},
"JPUSH_ADVERTISINGID_IOS" : {
"des" : "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填",
"key" : "JPush:ADVERTISINGID",
"value" : ""
},
"JPUSH_DEFAULTINITJPUSH_IOS" : {
"des" : "[iOS]是否默认初始化，是填true，不是填false或者不填",
"key" : "JPush:DEFAULTINITJPUSH",
"value" : ""
},
"JPUSH_OPPO_APPKEY" : {
"des" : "厂商OPPO-appkey,示例：OP-12345678",
"key" : "OPPO_APPKEY",
"value" : ""
},
"JPUSH_OPPO_APPID" : {
"des" : "厂商OPPO-appId,示例：OP-12345678",
"key" : "OPPO_APPID",
"value" : ""
},
"JPUSH_OPPO_APPSECRET" : {
"des" : "厂商OPPO-appSecret,示例：OP-12345678",
"key" : "OPPO_APPSECRET",
"value" : ""
},
"JPUSH_VIVO_APPKEY" : {
"des" : "厂商VIVO-appkey,示例：12345678",
"key" : "com.vivo.push.api_key",
"value" : ""
},
"JPUSH_VIVO_APPID" : {
"des" : "厂商VIVO-appId,示例：12345678",
"key" : "com.vivo.push.app_id",
"value" : ""
},
"JPUSH_MEIZU_APPKEY" : {
"des" : "厂商MEIZU-appKey,示例：MZ-12345678",
"key" : "MEIZU_APPKEY",
"value" : ""
},
"JPUSH_MEIZU_APPID" : {
"des" : "厂商MEIZU-appId,示例：MZ-12345678",
"key" : "MEIZU_APPID",
"value" : ""
},
"JPUSH_XIAOMI_APPKEY" : {
"des" : "厂商XIAOMI-appKey,示例：MI-12345678",
"key" : "XIAOMI_APPKEY",
"value" : ""
},
"JPUSH_XIAOMI_APPID" : {
"des" : "厂商XIAOMI-appId,示例：MI-12345678",
"key" : "XIAOMI_APPID",
"value" : ""
}
}
}
}
}
},
/* 快应用特有相关 */

81
pages/index/index.vue
View File

@ -4,9 +4,8 @@
<view class="content-top">
<view class="content-tops">
<view class="content-top_img" v-if="Object.keys(userInfoData).length>0">
<image :src="userInfoData.mer_info.mer_avatar"
v-if="userInfoData.mer_info&&userInfoData.mer_info.mer_avatar" mode="aspectFill"
@click="logout">
<image :src="userInfoData.mer_info.mer_avatar" v-if="userInfoData.mer_info&&userInfoData.mer_info.mer_avatar"
mode="aspectFill" @click="logout">
</image>
<image src="@/static/images/f.png" v-else mode="aspectFit" @click="logout"></image>
</view>
@ -275,8 +274,7 @@
<view class="settlementAgreement" v-if="isFshow">
<view class="setAgCount" style="width: 100%;height: 100%; padding-top: 160rpx;">
<!-- <i class="icon iconfont icon-cha" @click="recuo"></i> -->
<view class="" style="width: 90rpx;height: 90rpx; position: absolute;right: 10rpx; top:90rpx"
@click="recuo">
<view class="" style="width: 90rpx;height: 90rpx; position: absolute;right: 10rpx; top:90rpx" @click="recuo">
<image src="@/static/images/close.png" mode="aspectFit" style="width: 90rpx;height: 90rpx;"></image>
</view>
<div class="title">{{detail.title}}</div>
@ -291,8 +289,7 @@
拒绝
</button> -->
<button class="btn" :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0"
@click="agree">
<button class="btn" :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0" @click="agree">
<text v-if="num>0">请仔细阅读协议{{num}}S</text>
<text v-else>同意本协议</text>
</button>
@ -320,49 +317,43 @@
<view class="item" v-if="userInfoData.mer_info&&userInfoData.mer_info.is_company">
<view class="acea-row row-middle" style="display: flex;align-items: flex-start;">
<text class="item-name" style="flex-shrink: 0;">公司名称:</text>
<input style="font-size: 31rpx;" placeholder="请输入公司名称"
v-model="merchantData.company_name" @input="validateBtn"
placeholder-class='placeholder' />
<input style="font-size: 31rpx;" placeholder="请输入公司名称" v-model="merchantData.company_name"
@input="validateBtn" placeholder-class='placeholder' />
</view>
</view>
<view class="item" v-else>
<view class="acea-row row-middle" style="display: flex;align-items: flex-start;">
<text class="item-name" style="flex-shrink: 0;">持卡人:</text>
<input style="font-size: 31rpx;" placeholder="请输入持卡人姓名"
v-model="merchantData.company_name" @input="validateBtn"
placeholder-class='placeholder' />
<input style="font-size: 31rpx;" placeholder="请输入持卡人姓名" v-model="merchantData.company_name"
@input="validateBtn" placeholder-class='placeholder' />
</view>
</view>
<view class="item" v-if="userInfoData.mer_info&&userInfoData.mer_info.is_company">
<view class="acea-row row-middle">
<text class="item-name">对公账号:</text>
<input style="font-size: 31rpx;" type="number" placeholder="请输入对公账号"
v-model="merchantData.bank_code" @input="validateBtn"
placeholder-class='placeholder' />
<input style="font-size: 31rpx;" 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 style="font-size: 31rpx;" type="number" placeholder="请输入银行卡号"
v-model="merchantData.bank_code" @input="validateBtn"
placeholder-class='placeholder' />
<input style="font-size: 31rpx;" 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 style="font-size: 31rpx;" type="text" maxlength="30" placeholder="请输入开户银行名称"
v-model="merchantData.bank_username" @input="validateBtn"
placeholder-class='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 style="font-size: 31rpx;" type="text" placeholder="请输入开户网点"
v-model="merchantData.bank_opening" @input="validateBtn"
placeholder-class='placeholder' />
<input style="font-size: 31rpx;" type="text" placeholder="请输入开户网点" v-model="merchantData.bank_opening"
@input="validateBtn" placeholder-class='placeholder' />
</view>
</view>
<!-- <view class="item">
@ -392,10 +383,9 @@
class="item-name">{{userInfoData.mer_info&&userInfoData.mer_info.is_company?"开户凭证:":"银行卡图片:"}}</text>
</view>
<view class="item-card">
<view class="item-carda" @click='uploadpic({type:3})'
v-if='merchantData.bank_front.length==0'>
<image v-if="userInfoData.mer_info&&userInfoData.mer_info.is_company"
src="@/static/images/KHPZ.png" mode="aspectFit"></image>
<view class="item-carda" @click='uploadpic({type:3})' v-if='merchantData.bank_front.length==0'>
<image v-if="userInfoData.mer_info&&userInfoData.mer_info.is_company" src="@/static/images/KHPZ.png"
mode="aspectFit"></image>
<image v-else src="@/static/images/YHKZ.png" mode="aspectFit"></image>
</view>
<view class="item-carda" @click='DelPic({type:3})' v-else>
@ -548,16 +538,21 @@
// type: 12,
// image: require('@/static/images/index11.png')
// },
{
name: '提现管理',
type: 5,
image: require('@/static/images/index8.png')
},
// {
// name: '提现管理',
// type: 5,
// image: require('@/static/images/index8.png')
// },
// {
// name: '客服记录',
// type: 6,
// image: require('@/static/images/index6.png')
// },
{
name: '提货付款',
type: 17,
image: require('@/static/images/index24.png')
},
{
name: '全部',
type: 8,
@ -600,9 +595,9 @@
image: require('@/static/images/index2.png')
},
{
name: '商户设置',
type: 12,
image: require('@/static/images/index11.png')
name: '提货付款',
type: 17,
image: require('@/static/images/index24.png')
},
{
name: '全部',
@ -636,9 +631,9 @@
image: require('@/static/images/index4.png')
},
{
name: '转账订单',
type: 15,
image: require('@/static/images/index13.png')
name: '提货付款',
type: 17,
image: require('@/static/images/index24.png')
},
{
name: '补贴进度',
@ -677,9 +672,7 @@
productList: [],
userid: '',
userInfoData: {},
isshow: false,
codenote: [],
validate: false,
merchantData: {
@ -1375,6 +1368,12 @@
url: '/pages/activeCode/subsidy'
})
break;
case 17:
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) Toast('暂无权限');
else uni.navigateTo({
url: '/pages/payment/qrcode'
})
break;
default:
uni.navigateTo({
url: '/pages/moreProject/moreProject'