mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

商户入驻 生产 供销等界面更新

Browse Source
This commit is contained in:
jia 2023-09-27 19:43:53 +08:00
parent bff6905dee
commit 10fa18df32
14 changed files with 262 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
App.vue
View File

@ -161,7 +161,7 @@
jpushModule.initJPushService() jpushModule.initJPushService()
jpushModule.addConnectEventListener(result => { jpushModule.addConnectEventListener(result => {
let connectEnable = result.connectEnable let connectEnable = result.connectEnable
// console.log("jpush连接", connectEnable) console.log("jpush连接", connectEnable)
}) })
@ -223,6 +223,7 @@
}, },
onShow() { onShow() {
let that = this let that = this
// 记录H5和公众号 // 记录H5和公众号
if (this.$store.state.app.token) { if (this.$store.state.app.token) {

8
manifest.json
View File

@ -103,13 +103,13 @@
"weixin" : { "weixin" : {
"__platform__" : [ "ios", "android" ], "__platform__" : [ "ios", "android" ],
"appid" : "wx9d68c92b550ddd1e", "appid" : "wx9d68c92b550ddd1e",
"UniversalLinks" : "https://mer.crmeb.net/" "UniversalLinks" : "https://shop.lihaink.cn/"
} }
}, },
"share" : { "share" : {
"weixin" : { "weixin" : {
"appid" : "wx9d68c92b550ddd1e", "appid" : "wx9d68c92b550ddd1e",
"UniversalLinks" : "https://mer.crmeb.net/" "UniversalLinks" : "https://shop.lihaink.cn/"
} }
}, },
"geolocation" : { "geolocation" : {
@ -160,7 +160,7 @@
}, },
"nativePlugins" : { "nativePlugins" : {
"JG-JCore" : { "JG-JCore" : {
"JPUSH_APPKEY_IOS" : "b5f679f4357018605ea6fd2e", "JPUSH_APPKEY_IOS" : "8a5efd65cda14fafa6e64ad3",
"JPUSH_CHANNEL_IOS" : "", "JPUSH_CHANNEL_IOS" : "",
"JPUSH_APPKEY_ANDROID" : "b5f679f4357018605ea6fd2e", "JPUSH_APPKEY_ANDROID" : "b5f679f4357018605ea6fd2e",
"JPUSH_CHANNEL_ANDROID" : "", "JPUSH_CHANNEL_ANDROID" : "",
@ -178,7 +178,7 @@
"JPUSH_APPKEY_IOS" : { "JPUSH_APPKEY_IOS" : {
"des" : "[iOS]极光portal配置应用信息时分配的AppKey", "des" : "[iOS]极光portal配置应用信息时分配的AppKey",
"key" : "JCore:APP_KEY", "key" : "JCore:APP_KEY",
"value" : "7869a2f94b120cfb4431b96f" "value" : "daebe19b547c43128796a078"
}, },
"JPUSH_CHANNEL_IOS" : { "JPUSH_CHANNEL_IOS" : {
"des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default", "des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default",

2
pages.json
View File

@ -839,7 +839,7 @@
}, { }, {
"path": "payment/payment", "path": "payment/payment",
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "支付",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }

4
pages/goods_details/index.vue
View File

@ -290,8 +290,8 @@
<view v-if="description.content && description.content.title" class="title"> <view v-if="description.content && description.content.title" class="title">
{{description.content.title}} {{description.content.title}}
</view> </view>
<view v-if="description.content && description.content.image" class="pictures"> <view v-if="description.content && description.content.image" class="pictures" style="background-color: #fff;">
<image v-for="(item,index) in description.content.image" :key="index" :src="item"> <image v-for="(item,index) in description.content.image" :key="index" :src="item" mode="aspectFit">
</image> </image>
</view> </view>
</view> </view>

11
pages/margin/margin.vue
View File

@ -112,6 +112,7 @@
merchant({ merchant({
id: this.mer_id id: this.mer_id
}).then((res) => { }).then((res) => {
this.merchant_Data = res.data this.merchant_Data = res.data
}); });
}, },
@ -137,14 +138,14 @@
orderInfo: res.data orderInfo: res.data
.config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】 .config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
success: (res) => { success: (res) => {
this.$util.Tips({ that.$util.Tips({
title: '支付成功' title: '支付成功'
}); });
this.decimal() that.decimal()
this.list(true) that.list(true)
}, },
fail: (err) => { fail: (err) => {
this.$util.Tips({ that.$util.Tips({
title: '支付失败' title: '支付失败'
}); });
@ -176,8 +177,6 @@
} }
.content-order { .content-order {
background: #F4F4F4; background: #F4F4F4;
border-radius: 21rpx 21rpx; border-radius: 21rpx 21rpx;
margin-top: 30rpx; margin-top: 30rpx;

24
pages/nongKe/cloud_entrepot/indexa.vue
View File

@ -121,15 +121,16 @@
@click='goBack'></i> @click='goBack'></i>
</view> </view>
<view class="" style="font-size: 40rpx;transform: skewX(-10deg);"> <view class="" style="font-size: 40rpx;transform: skewX(-10deg);">
供销综合云市场 供销综合云商品
</view> </view>
</view> </view>
<view style="position: relative;width: 289.14rpx;"> <view style="position: relative;width: 289.14rpx;">
<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="请输入..." <u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="请输入..."
v-model="keyword" class="serch_cls"></u-search> v-model="keyword" class="serch_cls" style="height: 56.82rpx;"></u-search>
<u--image class="img_cls" :showLoading="true" src="/static/images/GXSC/SSBT.png" <!-- <u--image class="img_cls" :showLoading="true" src="/static/images/GXSC/SSBT.png"
width="115.65rpx" height="56.82rpx" @click="serch"></u--image> width="115.65rpx" height="56.82rpx" @click="serch"></u--image> -->
<view class="serchbtn img_cls" @click="serch">搜索</view>
</view> </view>
<view class='head_r' @click="showPop=true"> <view class='head_r' @click="showPop=true">
<u--image :showLoading="true" src="/static/images/LHYC/QB.png" width="50.82rpx" <u--image :showLoading="true" src="/static/images/LHYC/QB.png" width="50.82rpx"
@ -969,6 +970,19 @@
} }
} }
.serchbtn {
// position: absolute;
// right: 5rpx;
// top: 5rpx;
width: 100rpx;
height: 50rpx;
border-radius: 30rpx;
text-align: center;
line-height: 50rpx;
// background-color: #FEAB00;
background: linear-gradient(to right, #F84221, #FF6D20);
}
.selected-list { .selected-list {
padding: 24rpx 14rpx; padding: 24rpx 14rpx;
border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx; border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
@ -1201,7 +1215,7 @@
.img_cls { .img_cls {
position: absolute; position: absolute;
top: 50%; top: 50%;
right: 7rpx; right: 5rpx;
transform: translateY(-50%); transform: translateY(-50%);
} }

21
pages/nongKe/food/index.vue
View File

@ -26,8 +26,9 @@
:value='sotreParam.keyword' @confirm="searchSubmit"></input> --> :value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称" <u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
v-model="sotreParam.keyword" class="serch_cls"></u-search> v-model="sotreParam.keyword" class="serch_cls"></u-search>
<u--image @tap="searchSubmit" class="img_cls" :showLoading="true" <view class="serchbtn img_cls" @tap="searchSubmit">搜索</view>
src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image> <!-- <u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image> -->
</view> </view>
</view> </view>
@ -703,7 +704,19 @@
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
.serchbtn {
// position: absolute;
// right: 5rpx;
// top: 5rpx;
width: 100rpx;
height: 50rpx;
border-radius: 30rpx;
text-align: center;
line-height: 50rpx;
// background-color: #FEAB00;
color: #fff;
background: linear-gradient(to right, #F84221, #FF6D20);
}
.com_name { .com_name {
font-size: 32rpx; font-size: 32rpx;
// background-color: red; // background-color: red;
@ -1304,7 +1317,7 @@
.img_cls { .img_cls {
position: absolute; position: absolute;
top: 50%; top: 50%;
right: 7rpx; right: 5rpx;
transform: translateY(-50%); transform: translateY(-50%);
} }

27
pages/nongKe/specialty/index.vue
View File

@ -9,8 +9,11 @@
<view class="head_tit"> <view class="head_tit">
<view class="" style="display: flex;align-items: center;"> <view class="" style="display: flex;align-items: center;">
<view class="back" @click='backjJump()' style="margin-right: 17rpx;"> <view class="back" @click='backjJump()' style="margin-right: 17rpx;">
<u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx" <!-- <u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
height="50.82rpx"></u--image> height="50.82rpx"></u--image> -->
<i class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;"
></i>
</view> </view>
<view style="font-size: 40rpx;"> <view style="font-size: 40rpx;">
<!-- {{titName}} --> <!-- {{titName}} -->
@ -27,8 +30,9 @@
:value='sotreParam.keyword' @confirm="searchSubmit"></input> --> :value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称" <u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
v-model="sotreParam.keyword" class="serch_cls"></u-search> v-model="sotreParam.keyword" class="serch_cls"></u-search>
<u--image @tap="searchSubmit" class="img_cls" :showLoading="true" <view class="serchbtn img_cls" @tap="searchSubmit">搜索</view>
src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image> <!-- <u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image> -->
</view> </view>
</view> </view>
@ -700,6 +704,19 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.serchbtn {
// position: absolute;
// right: 5rpx;
// top: 5rpx;
width: 100rpx;
height: 50rpx;
border-radius: 30rpx;
text-align: center;
line-height: 50rpx;
// background-color: #FEAB00;
color: #fff;
background: linear-gradient(to right, #F84221, #FF6D20);
}
* { * {
margin: 0; margin: 0;
padding: 0; padding: 0;
@ -1305,7 +1322,7 @@
.img_cls { .img_cls {
position: absolute; position: absolute;
top: 50%; top: 50%;
right: 7rpx; right: 5rpx;
transform: translateY(-50%); transform: translateY(-50%);
} }

21
pages/nongKe/tourism/index.vue
View File

@ -29,8 +29,9 @@
:value='sotreParam.keyword' @confirm="searchSubmit"></input> --> :value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称" <u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
v-model="sotreParam.keyword" class="serch_cls"></u-search> v-model="sotreParam.keyword" class="serch_cls"></u-search>
<u--image @tap="searchSubmit" class="img_cls" :showLoading="true" <view class="serchbtn img_cls" @tap="searchSubmit">搜索</view>
src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image> <!-- <u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image> -->
</view> </view>
</view> </view>
@ -704,7 +705,19 @@
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
.serchbtn {
// position: absolute;
// right: 5rpx;
// top: 5rpx;
width: 100rpx;
height: 50rpx;
border-radius: 30rpx;
text-align: center;
line-height: 50rpx;
// background-color: #FEAB00;
color: #fff;
background: linear-gradient(to right, #F84221, #FF6D20);
}
.com_name { .com_name {
font-size: 32rpx; font-size: 32rpx;
// background-color: red; // background-color: red;
@ -1305,7 +1318,7 @@
.img_cls { .img_cls {
position: absolute; position: absolute;
top: 50%; top: 50%;
right: 7rpx; right: 5rpx;
transform: translateY(-50%); transform: translateY(-50%);
} }

2
pages/product/goodsOnSale/index.vue
View File

@ -5,7 +5,7 @@
<view class="title_search"> <view class="title_search">
<span class="iconfont">&#xe67d;</span> <span class="iconfont">&#xe67d;</span>
<form @submit="search" report-submit="true"> <form @submit="search" report-submit="true">
<input type="text" :name="where.keyword" v-model="where.keyword" placeholder="搜索商品" confirm-type='search'/> <input type="text" v-model="where.keyword" placeholder="搜索商品" confirm-type='search'/>
</form> </form>
</view> </view>
</view> </view>

113
pages/store/settled/index.vue
View File

@ -3,9 +3,10 @@
<!-- #ifdef MP || APP-PLUS --> <!-- #ifdef MP || APP-PLUS -->
<view class="conten-top" :style="'height:'+statusBarHeight+'px'"> <view class="conten-top" :style="'height:'+statusBarHeight+'px'">
<view class="" style="position: absolute;left: 30rpx;bottom: 15rpx;" @click="logout"><i class="iconfont icon-xiangzuo" <view class="" style="position: absolute;left: 30rpx;bottom: 15rpx;" @click="logout"><i
style="font-size: 40rpx;text-align: left;"></i></view> class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;"></i></view>
<view class="" style="position: absolute;left: 30rpx;bottom: 15rpx;width: 120rpx; left:50%;margin-left:-60rpx;"> <view class=""
style="position: absolute;left: 30rpx;bottom: 15rpx;width: 120rpx; left:50%;margin-left:-60rpx;">
商家入驻 商家入驻
</view> </view>
</view> </view>
@ -226,7 +227,7 @@
拒绝 拒绝
</button> </button>
<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0" @click="formSubmit"> <button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0" @click="agree">
<text v-if="num>0">请仔细阅读协议{{num}}S</text> <text v-if="num>0">请仔细阅读协议{{num}}S</text>
<text v-else>同意</text> <text v-else>同意</text>
@ -290,6 +291,9 @@
import { import {
configMap configMap
} from "@/utils"; } from "@/utils";
import {
intention,
} from "@/api/product"
import parser from "@/components/jyf-parser/jyf-parser"; import parser from "@/components/jyf-parser/jyf-parser";
import authorize from '@/components/Authorize'; import authorize from '@/components/Authorize';
import Verify from '@/components/verify/verify.vue'; import Verify from '@/components/verify/verify.vue';
@ -371,7 +375,13 @@
isType: false, isType: false,
num: 10, num: 10,
detail: {}, detail: {},
statusBarHeight:0 statusBarHeight: 0,
where: {
type: 1,
page: 1,
limit: 10
},
codenote: []
}; };
}, },
beforeDestroy() { beforeDestroy() {
@ -407,6 +417,12 @@
}, },
onReady() {}, onReady() {},
methods: { methods: {
//获取交易信息
codelist() {
intention(this.where).then(res => {
this.codenote = res.data.list
})
},
//退出 //退出
logout() { logout() {
uni.switchTab({ uni.switchTab({
@ -782,15 +798,9 @@
showxy() { showxy() {
this.isshow = true this.isshow = true
}, },
//提交
formSubmit: function(e) { agree() {
let that = this; let that = this;
if (that.validateForm() && that.validate) {
if (this.num == 0) {
let requestData = { let requestData = {
phone: that.merchantData.phone, phone: that.merchantData.phone,
mer_name: that.merchantData.enterprise_name, mer_name: that.merchantData.enterprise_name,
@ -838,18 +848,93 @@
} }
}).catch(res => { }).catch(res => {
this.isshow = false
that.validate = true; that.validate = true;
that.$util.Tips({ that.$util.Tips({
title: res title: res
}); });
}) })
} }
},
formSubmit() {
if (this.validateForm() && this.validate) {
if (this.codenote.length == 0) {
this.isshow = true
this.countDown()
} else {
if (this.codenote[0].status == 0) {
uni.showModal({
title: '申请正在审核中，请勿重复提交'
})
} else { } else {
this.isshow = true this.isshow = true
this.countDown() this.countDown()
} }
} }
}
// let that = this;
// if (that.validateForm() && that.validate) {
// if (this.num == 0) {
// let requestData = {
// phone: that.merchantData.phone,
// mer_name: that.merchantData.enterprise_name,
// name: that.merchantData.user_name,
// code: that.merchantData.yanzhengma,
// company_name: that.merchantData.company_name,
// address: that.merchantData.address,
// social_credit_code: that.merchantData.social_credit_code,
// merchant_category_id: that.merchantData.classification,
// mer_type_id: that.merchantData.mer_type,
// mer_storeType: this.mer_storeType,
// area_id: this.area_id,
// street_id: this.street_id,
// village_id: this.village_id,
// is_nmsc: this.isnum,
// images: that.pics
// }
// that.validate = false;
// if (that.mer_i_id) {
// updateGoodsRecord(that.mer_i_id, requestData).then(res => {
// if (res.status == 200) {
// title: '提交成功',
// that.loading = true;
// that.timer = setTimeout(() => {
// that.successful = true;
// that.validate = true;
// }, 1000)
// }
// }).catch(res => {
// this.isshow = false
// that.validate = true;
// that.$util.Tips({
// title: res
// });
// })
// } else {
// create(requestData).then(data => {
// if (data.status == 200) {
// title: '提交成功',
// that.loading = true;
// this.timer = setTimeout(() => {
// that.successful = true;
// that.validate = true;
// }, 1000)
// }
// }).catch(res => {
// that.validate = true;
// that.$util.Tips({
// title: res
// });
// })
// }
// } else {
// this.isshow = true
// this.countDown()
// }
// }

11
pages/supply_chains/supply_chains.vue
View File

@ -246,12 +246,14 @@
loadTitle: '加载更多', loadTitle: '加载更多',
} }
}, },
onPullDownRefresh() { onPullDownRefresh() {
this.list(true, this.street_id); this.list(true, this.street_id);
this.Area() this.Area()
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
}, },
onShow() {
this.selfLocation()
},
onLoad() { onLoad() {
this.Area() this.Area()
this.selfLocation() this.selfLocation()
@ -268,19 +270,14 @@
}) })
}, },
onShow(){
this.list(true,this.street_id);
},
onReachBottom() { onReachBottom() {
if (this.productList.length > 0) { if (this.productList.length > 0) {
setTimeout(() => { setTimeout(() => {
this.list(false, this.street_id); this.list(false, this.street_id);
}, 500) }, 500)
} else {
this.list(true, this.street_id)
} }
}, },
beforeDestroy() { beforeDestroy() {
// 销毁监听事件 // 销毁监听事件

2
pages/users/login/login_copy.vue
View File

@ -892,7 +892,9 @@
// #ifdef APP-PLUS // #ifdef APP-PLUS
jpushModule.initJPushService() jpushModule.initJPushService()
jpushModule.getRegistrationID(result => { jpushModule.getRegistrationID(result => {
if (result.registerID) { if (result.registerID) {
bindJG({ bindJG({
phone: this.account, phone: this.account,
jg_register_id: result.registerID jg_register_id: result.registerID

1
pages/users/payment/payment.vue
View File

@ -264,6 +264,7 @@
// }) // })
// }, 1000) // }, 1000)
uni.showToast({ uni.showToast({
icon:'none' ,
title: res.message title: res.message
}) })
}) })