diff --git a/App.vue b/App.vue index e273265..5129746 100644 --- a/App.vue +++ b/App.vue @@ -161,9 +161,10 @@ jpushModule.initJPushService() jpushModule.addConnectEventListener(result => { let connectEnable = result.connectEnable - // console.log("jpush连接", connectEnable) + console.log("jpush连接", connectEnable) }) + // 设置别名 // jpushModule.setAlias({ // 'alias': uni.getStorageSync('userId'), @@ -221,7 +222,8 @@ }, onShow() { - + + let that = this // 记录H5和公众号 if (this.$store.state.app.token) { diff --git a/api/api.js b/api/api.js index 6877e42..f5545dc 100644 --- a/api/api.js +++ b/api/api.js @@ -5,7 +5,7 @@ import request from "@/utils/request.js"; * */ export function cloudWarehouse(data) { - return request.get("store/product/cloudWarehouse", data); + return request.get("store/product/cloudWarehouse", data, { noAuth: true }); } /** * 获取云仓分类 @@ -290,4 +290,23 @@ export function village(data) { */ export function brigade(data) { return request.get('v2/system/brigade', data, { noAuth: true }); -} \ No newline at end of file +} + +/* + 生产 -- 获取商户保证金信息支付接口 +*/ +export function paymerchant() { + return request.post(`user/margin`,{}); +} + +/* + 生产 -- 获取商户保证金信息接口 +*/ +export function merchant(data) { + return request.get(`store/merchant/margin`, data); +} + +//获取保证金缴纳列表 +export function marginlist(data) { + return request.get(`user/margin/list`,data); +} diff --git a/api/community.js b/api/community.js index fe9ec77..23d5d09 100644 --- a/api/community.js +++ b/api/community.js @@ -7,7 +7,7 @@ // +---------------------------------------------------------------------- // | Author: CRMEB Team // +---------------------------------------------------------------------- -import request from "@/utils/request.js"; +import request from "@/utils/requesta.js"; /** 获取话题分类*/ export function getTopicList() { @@ -83,7 +83,9 @@ export function videoList(data) { } /**自己的视频列表*/ export function deoList(id) { - return request.get(`community/show/${id}`); + return request.get(`community/show/${id}`, { + noAuth: true + }); } export function myVideoList(id,data) { diff --git a/api/product.js b/api/product.js index 8bfa886..28dcaf2 100644 --- a/api/product.js +++ b/api/product.js @@ -303,8 +303,8 @@ export function getDeliveryType(merId) { /* 商品 -- 获取交易协议内容 */ -export function business() { - return request.get(`business/agree?type=business_apply_agree`, {}, { +export function business(data) { + return request.get(`business/agree`, data, { noAuth: true }); } @@ -319,5 +319,5 @@ export function intention(data) { 商品 -- 同意提交申请 */ export function intentionbus(data) { - return request.post(`intention/business`, {}); + return request.post(`intention/business`, data); } \ No newline at end of file diff --git a/api/store.js b/api/store.js index 399e35a..ed9b774 100644 --- a/api/store.js +++ b/api/store.js @@ -1,4 +1,5 @@ import request from "@/utils/request.js"; +import requestb from "@/utils/requestb.js"; /** * 扫码查询商品 @@ -577,6 +578,8 @@ export function vicinityStoreApi(data) { /* 商家入驻 -- 获取商户入驻申请协议内容 */ -export function agreeiness() { - return request.get(`business/agree?type=sys_intention_agree`, {}, { noAuth: true }); +export function agreeiness(data) { + return request.get(`business/agree`, data, { + noAuth: true + }); } \ No newline at end of file diff --git a/api/uniMP.js b/api/uniMP.js index 06f8b85..3562f10 100644 --- a/api/uniMP.js +++ b/api/uniMP.js @@ -16,3 +16,12 @@ export function getGXconfig(data) { return request.get("global/config", data); } + +/** + * 获取商城小程序信息 + */ + +export function miniapp(data) { + return request.get("miniapp/version?version=1", data); +} + diff --git a/api/user.js b/api/user.js index 0009c40..4594d26 100644 --- a/api/user.js +++ b/api/user.js @@ -8,6 +8,8 @@ // | Author: CRMEB Team // +---------------------------------------------------------------------- import request from "@/utils/request.js"; + +import request1 from "@/utils/requestb.js"; import Cache from '@/utils/cache' /** * 获取版本信息 @@ -721,3 +723,10 @@ export function getBillDetil() { return request.get(`mer/financial_record`) } + + +//获取商户入驻所签署公司 + +export function merstreet(data) { + return request1.get(`company/street_company`, data); +} diff --git a/components/orderGoods/index.vue b/components/orderGoods/index.vue index f1c4653..4483d6e 100644 --- a/components/orderGoods/index.vue +++ b/components/orderGoods/index.vue @@ -2,7 +2,7 @@ - {{evaluate == 0 ? '待核销' : '已核销'}} + {{evaluate == 7 ? '待核销' : '已核销'}} {{orderData.verify_time}} diff --git a/components/payment/index.vue b/components/payment/index.vue index a27272f..552db8d 100644 --- a/components/payment/index.vue +++ b/components/payment/index.vue @@ -108,7 +108,6 @@ type = 'alipayQr'; // #endif } else if (paytype == 'creditBuy') { - console.log('123123'); type = 'creditBuy' } if (!that.order_id) return that.$util.Tips({ @@ -371,6 +370,10 @@ break; // #endif } + + + + }).catch(err => { uni.hideLoading(); return that.$util.Tips({ diff --git a/config/app.js b/config/app.js index 8597d11..2182f5b 100644 --- a/config/app.js +++ b/config/app.js @@ -6,33 +6,35 @@ let openPlantGrass = '-openPlantGrass-' let httpApi let httpApiTwo let httpApiThree -// 网络接口修改此字符 小程序域名要求https -// let httpApi = 'http://192.168.31.110:8324' // 测试 -if (process.env.NODE_ENV === "development") { - // httpApi = 'https://shop.lihaink.cn' // 生产 - httpApi = "https://crmeb-test.shop.lihaink.cn" - // httpApi = "http://192.168.0.222" - // httpApi = "http://192.168.0.108:8325" - // httpApi = 'http://192.168.0.108:8325' - // #ifdef MP-WEIXIN - httpApiTwo = "https://nk.lihaink.cn" - httpApiThree = 'http://ceshi-oa.lihaink.cn' - // #endif - // #ifdef H5 - // httpApiTwo = "baseUrl" // h5跨域配置 - httpApiTwo = "https://nk.lihaink.cn" // h5跨域配置 - // httpApiThree = 'baseUrlTest' // h5跨域配置 - - // #endif -} else if (process.env.NODE_ENV === 'production') { - httpApi = 'https://shop.lihaink.cn' // 生产 +let httpApiFour - // httpApi = "https://crmeb-test.shop.lihaink.cn" - httpApiTwo = 'https://nk.lihaink.cn' // 生产 - httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产 +// 在打包之前请检查当前环境是否正确 +const env = 'dev'; // 开发 +// const env = 'prod'; // 生产 +// const env = 'prew'; // 预上线 + +switch (env) { + case 'prod': + httpApi = 'https://shop.lihaink.cn' // 生产 + httpApiTwo = 'https://nk.lihaink.cn' + httpApiThree = 'http://ceshi-oa.lihaink.cn' + httpApiFour = 'https://worker-task.lihaink.cn' + break; + case 'prew': + httpApi = 'https://test.shop.lihaink.cn' //预发布环境 + httpApiTwo = "https://nk.lihaink.cn" + httpApiThree = 'http://ceshi-oa.lihaink.cn' + httpApiFour = 'https://preview-worker-task.lihaink.cn' + break; + default: + httpApi = "https://crmeb-test.shop.lihaink.cn" // 测试 + httpApiTwo = "https://nk.lihaink.cn" + httpApiThree = 'http://ceshi-oa.lihaink.cn' + httpApiFour = 'https://ceshi-worker-task.lihaink.cn' } -// httpApi = 'https://shop.lihaink.cn' // 生产 -// httpApiTwo = 'https://nk.lihaink.cn' // 生产 + + + // 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer.crmeb.net // let wsApi = 'ws://192.168.3.20:8324' @@ -45,11 +47,13 @@ module.exports = { HTTP_REQUEST_URL: httpApi, HTTP_REQUEST_URL_TWO: httpApiTwo, HTTP_REQUEST_URL_THREE: httpApiThree, + HTTP_REQUEST_URL_FOUR: httpApiFour, VUE_APP_WS_URL: `${wsApi}?type=user`, // #endif - + // #ifdef H5 //H5接口是浏览器地址 + HTTP_REQUEST_URL_FOUR: httpApiFour|| window.location.protocol + "//" + window.location.host, HTTP_REQUEST_URL: httpApi || window.location.protocol + "//" + window.location.host, HTTP_REQUEST_URL_TWO: httpApiTwo || window.location.protocol + "//" + window.location.host, // 聊天长连接地址 diff --git a/libs/uniApi.js b/libs/uniApi.js index 612c4c8..ae80c51 100644 --- a/libs/uniApi.js +++ b/libs/uniApi.js @@ -130,6 +130,7 @@ export function Modal(title = '提示', content = '这是一个模态弹窗!', o }) { return new Promise((reslove, reject) => { uni.showModal({ + ...obj, title: title, content: content, success: (res) => { diff --git a/manifest.json b/manifest.json index d51d063..21d401e 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "惠农生活", "appid" : "__UNI__3A527D1", "description" : "", - "versionName" : "1.4.1", - "versionCode" : 141, + "versionName" : "1.4.7", + "versionCode" : 147, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -31,7 +31,8 @@ "UniMP" : { "description" : "uni小程序" }, - "Maps" : {} + "Maps" : {}, + "Push" : {} }, "safearea" : { "bottom" : { @@ -103,13 +104,13 @@ "weixin" : { "__platform__" : [ "ios", "android" ], "appid" : "wx9d68c92b550ddd1e", - "UniversalLinks" : "https://mer.crmeb.net/" + "UniversalLinks" : "https://shop.lihaink.cn/" } }, "share" : { "weixin" : { "appid" : "wx9d68c92b550ddd1e", - "UniversalLinks" : "https://mer.crmeb.net/" + "UniversalLinks" : "https://shop.lihaink.cn/" } }, "geolocation" : { @@ -120,7 +121,8 @@ } }, "oauth" : {}, - "ad" : {} + "ad" : {}, + "push" : {} }, "icons" : { "android" : { @@ -160,8 +162,8 @@ }, "nativePlugins" : { "JG-JCore" : { - "JPUSH_APPKEY_IOS" : "b5f679f4357018605ea6fd2e", - "JPUSH_CHANNEL_IOS" : "", + "JPUSH_APPKEY_IOS" : "8a5efd65cda14fafa6e64ad3", + "JPUSH_CHANNEL_IOS" : "8a5efd65cda14fafa6e64ad3", "JPUSH_APPKEY_ANDROID" : "b5f679f4357018605ea6fd2e", "JPUSH_CHANNEL_ANDROID" : "", "__plugin_info__" : { @@ -178,7 +180,7 @@ "JPUSH_APPKEY_IOS" : { "des" : "[iOS]极光portal配置应用信息时分配的AppKey", "key" : "JCore:APP_KEY", - "value" : "7869a2f94b120cfb4431b96f" + "value" : "daebe19b547c43128796a078" }, "JPUSH_CHANNEL_IOS" : { "des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default", @@ -199,9 +201,9 @@ } }, "JG-JPush" : { - "JPUSH_ISPRODUCTION_IOS" : "", + "JPUSH_ISPRODUCTION_IOS" : "true", "JPUSH_ADVERTISINGID_IOS" : "", - "JPUSH_DEFAULTINITJPUSH_IOS" : "", + "JPUSH_DEFAULTINITJPUSH_IOS" : "true", "JPUSH_OPPO_APPKEY" : "", "JPUSH_OPPO_APPID" : "", "JPUSH_OPPO_APPSECRET" : "", diff --git a/pages.json b/pages.json index a5b41ca..c26eb18 100644 --- a/pages.json +++ b/pages.json @@ -1,32 +1,32 @@ { "pages": [ - //#ifdef APP-PLUS - //启动页 - { - "path": "pages/guide/judge", - "style": { - "enablePullDownRefresh": false, - "onReachBottomDistance": 100, - "navigationStyle": "custom", - "app-plus": { - "contentAdjust": false, - "bounce": "none" + //#ifdef APP-PLUS + //启动页 + { + "path": "pages/guide/judge", + "style": { + "enablePullDownRefresh": false, + "onReachBottomDistance": 100, + "navigationStyle": "custom", + "app-plus": { + "contentAdjust": false, + "bounce": "none" + } } - } - }, - { - "path": "pages/guide/guide", - "style": { - "enablePullDownRefresh": false, - "onReachBottomDistance": 100, - "navigationStyle": "custom", - "app-plus": { - "contentAdjust": false, - "bounce": "none" + }, + { + "path": "pages/guide/guide", + "style": { + "enablePullDownRefresh": false, + "onReachBottomDistance": 100, + "navigationStyle": "custom", + "app-plus": { + "contentAdjust": false, + "bounce": "none" + } } - } - }, - // #endif + }, + // #endif //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages { "path": "pages/index/index", @@ -124,7 +124,8 @@ }, { "path": "pages/moreProject/moreProject", "style": { - "navigationBarTitleText": "更多功能", + "navigationBarTitleText": "商户平台", + "navigationStyle": "custom", "enablePullDownRefresh": false } @@ -146,7 +147,16 @@ "navigationStyle": "custom" } } - ], + ,{ + "path" : "pages/margin/margin", + "style" : + { + "navigationBarTitleText":"缴纳保证金", + "enablePullDownRefresh": false + } + + } + ], "subPackages": [{ "root": "pages/goods_cate", "name": "goods_cate", @@ -829,7 +839,7 @@ }, { "path": "payment/payment", "style": { - "navigationBarTitleText": "", + "navigationBarTitleText": "支付", "enablePullDownRefresh": false } @@ -981,6 +991,8 @@ { "path": "settled/index", "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "商家入驻" } }, { @@ -1122,18 +1134,6 @@ "navigationBarTitleText": "商品管理", "enablePullDownRefresh": true } - },{ - "path": "transactionApplication/index", - "style": { - "navigationBarTitleText": "交易申请", - "enablePullDownRefresh": false - } - },{ - "path": "transactionApplication/application", - "style": { - "navigationBarTitleText": "申请记录", - "enablePullDownRefresh": false - } }, { "path": "goodsOnSale/index", diff --git a/pages/admin/orderDetail/index.vue b/pages/admin/orderDetail/index.vue index 4d4d325..d7fc7a7 100644 --- a/pages/admin/orderDetail/index.vue +++ b/pages/admin/orderDetail/index.vue @@ -146,7 +146,7 @@ - + 同意 @@ -376,8 +376,11 @@ /*核销订单*/ goCancellation() { let that = this; + // uni.navigateTo({ + // url: '/pages/admin/cancellate_result/index?mer_id='+that.mer_id+'&code='+that.orderInfo.verify_code, + // }) uni.navigateTo({ - url: '/pages/admin/cancellate_result/index?mer_id='+that.mer_id+'&code='+that.orderInfo.verify_code, + url: `/pages/admin/order_cancellation/index?mer_id=${that.mer_id}` }) // uni.showModal({ // title: '订单核销', diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue index e01fdf4..399c417 100644 --- a/pages/admin/orderList/index.vue +++ b/pages/admin/orderList/index.vue @@ -553,6 +553,7 @@ uni.navigateTo({ url: `/pages/admin/orderDetail/index?id=${item.order_id}&mer_id=${item.mer_id}` }) + }, toRefundDetail(item) { uni.navigateTo({ diff --git a/pages/admin/order_cancellation/index.vue b/pages/admin/order_cancellation/index.vue index 2f54607..9a3d94d 100644 --- a/pages/admin/order_cancellation/index.vue +++ b/pages/admin/order_cancellation/index.vue @@ -131,8 +131,12 @@ // console.log(self.verify_code); verifierOrder(self.mer_id,self.verify_code) .then(res => { + // uni.navigateTo({ + // url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id + // }); + uni.navigateTo({ - url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id + url: '/pages/admin/orderList/index?types=2'+'&mer_id='+self.mer_id }); }) .catch(res => { @@ -161,8 +165,11 @@ scanType: ["qrCode", "barCode"] }).then(res=>{ this.verify_code = res.resultStr + // uni.navigateTo({ + // url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id + // }); uni.navigateTo({ - url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id + url: '/pages/admin/orderList/index?types=2'+'&mer_id='+self.mer_id }); // this.codeChange(); }).catch(res => { diff --git a/pages/chat/customer_list/index.vue b/pages/chat/customer_list/index.vue index da48440..517c85c 100644 --- a/pages/chat/customer_list/index.vue +++ b/pages/chat/customer_list/index.vue @@ -62,6 +62,9 @@ serviceList, serviceUserList } from "@/api/user"; + import { + getUserInfo + } from '@/api/user.js'; import { mapGetters } from "vuex"; export default { name: "CustomerList", @@ -88,13 +91,9 @@ computed: mapGetters(['isLogin','viewColor']), onLoad(optios) { this.type = optios.type; - this.mer_id = optios.mer_id; - if(this.isLogin){ - this.getList(this.mer_id) - } else { - this.isAuto = true; - this.isShowAuth = true - } + + + this.getindex() }, onShow(option) { if(this.isLogin){ @@ -119,6 +118,21 @@ this.clear = true; }, methods: { + //获取商户信息 + getindex(){ + getUserInfo().then(res => { + + this.mer_id = res.data.service.mer_id; + if(this.isLogin){ + this.getList(this.mer_id) + } else { + this.isAuto = true; + this.isShowAuth = true + } + // this.getList(this.mer_id) + // this.getList(res.data.service.mer_id, true); + }); + }, onLoadFun() { this.isShowAuth = false; this.getList(this.mer_id); @@ -217,7 +231,7 @@ }, }; - + \ No newline at end of file diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue index e324809..8c40e8b 100644 --- a/pages/moreProject/moreProject.vue +++ b/pages/moreProject/moreProject.vue @@ -1,21 +1,49 @@ @@ -375,12 +556,16 @@ import emptyPage from '@/components/emptyPage.vue'; import zbpSwiper from '@/components/zbpSwiper' import { - + mapGetters } from 'vuex' - import { - + business, + intention, + intentionbus + } from "@/api/product" + import { + merstreet, getUserInfo } from '@/api/user.js' import { @@ -392,7 +577,9 @@ Toast } from '@/libs/uniApi'; import { - getDiy + getDiy, + merchant, + paymerchant } from '@/api/api.js' export default { @@ -403,6 +590,8 @@ }, data() { return { + company: '', + organization_code: '', locationArr: ({}), emptyText: '暂无可用应用', jurisdiction: false, // 是否有权限 @@ -416,14 +605,39 @@ isShow: false, bgColor: '', isFshow: false, - street: '' + street: '', + detail: {}, + tagStyle: { + img: 'width:100%;display:block;' + }, + num: 15, + where: { + type: 2, + page: 1, + limit: 10 + }, + codenote: [], + validate: false, + merchantData: { + bank_username: '', + bank_opening: '', + bank_front: '', + bank_back: '', + cardno_front: '', + cardno_back: '' + }, + Fheight: 0, + statusBarHeight: 0 }; }, computed: { - ...mapGetters(['userInfo', 'isLogin']) + ...mapGetters(['userInfo', 'isLogin']) }, created() {}, - onLoad() {}, + onLoad() { + this.Fheight = uni.getSystemInfoSync().windowHeight + 'px'; + this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 45; + }, onShow() { if (this.isLogin) { this.emptyText = '暂无可用应用' @@ -433,23 +647,288 @@ this.jurisdiction = true } this.getUserInfo() - + this.codelist() + this.list() }, - - + + methods: { - navigator(url, t) { - - uni.navigateTo({ - url: url + //关闭弹窗 + close() { + this.$refs.popup.close() + this.num = 15 + }, + //获取交易信息 + codelist() { + intention(this.where).then(res => { + this.codenote = res.data.list }) }, + + + //提交 + formSubmit: function(e) { + let that = this; + if (that.validateForm() && that.validate) { + + that.validate = false; + + intentionbus(that.merchantData).then(res => { + if (res.status == 200) { + this.$refs.popup.close() + that.$util.Tips({ + title: '提交成功' + }); + this.codelist() + that.timer = setTimeout(() => { + that.successful = true; + that.validate = true; + }, 1000) + + } + }).catch(res => { + that.validate = true; + this.num = 15 + this.$refs.popup.close() + that.$util.Tips({ + title: res + }); + }) + + + } + + }, + //同意 + agree() { + this.$refs.popup.open() + this.isFshow = false + + }, + //拒绝 + refuse() { + uni.switchTab({ + url: '/pages/gather/gather' + }) + }, + //关闭弹窗 + recuo() { + + if (this.num > 0) { + this.num = 15 + this.isFshow = false + } else { + this.num = 15 + this.isFshow = false + } + }, + + countDown() { + let { + num + } = this; + // if (num === 3) this.nums = true; + num = num > 0 ? num - 1 : "0"; + setTimeout(() => { + + this.num = num; + if (num == '0') { + // this.launchApp() + return + } + + if (this.isFshow == false && this.num > 0) { + this.num = 15 + return + } + this.countDown(); + }, 1000); + + + }, + //验证 + validateBtn: function() { + let that = this, + value = that.merchantData; + if (value.bank_username && value.bank_opening) { + if (!that.isShowCode) { + that.validate = true; + } else { + if (that.codeVal) { + that.validate = true; + } else { + that.validate = false; + } + } + } else { + that.validate = false; + } + }, + validateForm: function() { + let that = this, + value = that.merchantData; + + if (!value.bank_username) return that.$util.Tips({ + title: '请输入银行账户姓名' + }); + if (!value.bank_opening) return that.$util.Tips({ + title: '请输入开户行' + }); + + if (value.bank_front.length == 0) return that.$util.Tips({ + title: '请上传一张或者多张图片' + }); + + if (value.bank_back.length == 0) return that.$util.Tips({ + title: '请上传一张或者多张图片' + }); + if (value.cardno_front.length == 0) return that.$util.Tips({ + title: '请上传一张或者多张图片' + }); + if (value.cardno_back.length == 0) return that.$util.Tips({ + title: '请上传一张或者多张图片' + }); + that.validate = true; + return true; + }, + /** + * 上传文件 + * + */ + uploadpic(data) { + let that = this; + if (data.type == 1) { + that.$util.uploadImageOne('upload/image', function(res) { + that.merchantData.cardno_front = res.data.path + + }); + } else if (data.type == 2) { + that.$util.uploadImageOne('upload/image', function(res) { + that.merchantData.cardno_back = res.data.path + + }); + } else if (data.type == 3) { + that.$util.uploadImageOne('upload/image', function(res) { + that.merchantData.bank_front = res.data.path + + }); + } else { + that.$util.uploadImageOne('upload/image', function(res) { + that.merchantData.bank_back = res.data.path + + }); + } + + }, + //删除图片 + DelPic(data) { + let that = this; + if (data.type == 1) { + + that.merchantData.cardno_front = '' + + + } else if (data.type == 2) { + + that.merchantData.cardno_back = '' + + + } else if (data.type == 3) { + + that.merchantData.bank_front = '' + + + } else { + + that.merchantData.bank_back = '' + + + } + + }, + //保证金缴纳 + margin(url) { + if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) { + + if (this.codenote.length == 0) { + this.isFshow = true + this.countDown() + } else { + if (this.codenote[0].status == 0) { + uni.showModal({ + title: '申请正在审核中，请勿重复提交' + }) + } else { + this.isFshow = true + this.countDown() + } + } + + } else { + + uni.navigateTo({ + url: url + `?mer_id=` + this.mer_id + }) + } + + }, + // + logout() { + uni.switchTab({ + url: '/pages/gather/gather' + }) + }, + //商户设置 + buyserset() { + uni.navigateTo({ + url: `/pages/product/basicSet?mer_id=` + this.mer_id + }) + }, + navigator(url, t) { + + if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) { + + + if (this.codenote.length == 0) { + this.isFshow = true + this.countDown() + } else { + if (this.codenote[0].status == 0) { + uni.showModal({ + title: '申请正在审核中，请勿重复提交' + }) + } else { + this.isFshow = true + this.countDown() + } + } + } else { + + uni.navigateTo({ + url: url + }) + } + }, getUserInfo: function() { let that = this; getUserInfo().then(res => { - that.userInfoData = res.data; - // console.log(res.data.service); + this.userInfoData = res.data; + this.merchantData.phone = res.data.phone + merstreet({ + street_code: res.data.mer_info.street_id + }).then((res) => { + if (res.code == 0) { + // this.$util.Tips({ + // title: res.msg + // }); + return false; + } + this.company = res.data.title + this.organization_code = res.data.organization_code + }).catch(res => { + console.log(res) + }) if (res.data.service == null) { // console.log('123'); this.isShow = false @@ -463,7 +942,16 @@ } // console.log(that.userInfoData); }); - } + }, + + //获取协议内容 + list() { + business({ + type: 'mer_settlement_agree' + }).then(res => { + this.detail = res.data + }) + }, } }; @@ -473,6 +961,374 @@ background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%); } + .conten-top { + width: 100%; + text-align: center; + background-color: #fff; + position: absolute; + top: 0; + position: fixed; + z-index: 10; + } + + .userpage { + width: 100%; + + + background-color: #fff; + position: relative; + } + + .userpage-icon { + width: 60rpx; + height: 60rpx; + position: absolute; + top: 65rpx; + left: 60rpx; + + image { + width: 100%; + height: 100%; + } + } + + .item-name { + width: 190rpx; + } + + .merchantsSettled { + height: 100%; + padding-top: 80rpx; + } + + .merchantsSettled .title { + font-size: 35rpx; + font-family: Microsoft YaHei; + font-weight: 400; + text-align: center; + } + + .merchantsSettled .list { + background-color: #fff; + border-radius: 12px; + margin: 0 15px; + position: absolute; + } + + .application-record { + position: absolute; + display: flex; + align-items: center; + top: 240rpx; + right: 0; + color: #fff; + font-size: 22rpx; + background-color: rgba(0, 0, 0, 0.3); + padding: 8rpx 18rpx; + border-radius: 20px 0px 0px 20px; + } + + .item-card { + display: flex; + margin-top: 20rpx; + + .item-carda { + width: 298rpx; + height: 175rpx; + margin-right: 20rpx; + + image { + width: 100%; + height: 100%; + } + } + + .item-cardb { + width: 298rpx; + height: 175rpx; + + image { + width: 100%; + height: 100%; + } + } + } + + .merchantsSettled .list .item { + padding: 50rpx 0 20rpx; + + position: relative; + margin: 0 20px; + + &.no-border { + border-bottom: none; + padding-left: 0; + padding-right: 0; + } + + .item-title { + color: #666666; + font-size: 28rpx; + display: block; + } + + .item-desc { + color: #B2B2B2; + font-size: 22rpx; + display: block; + margin-top: 9rpx; + line-height: 36rpx; + } + } + + .acea-row, + .upload { + display: -webkit-box; + display: -moz-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-box-lines: multiple; + -moz-box-lines: multiple; + -o-box-lines: multiple; + -webkit-flex-wrap: wrap; + -ms-flex-wrap: wrap; + flex-wrap: wrap; + } + + .upload { + margin-top: 20rpx; + } + + .acea-row.row-middle { + -webkit-box-align: center; + -moz-box-align: center; + -o-box-align: center; + -ms-flex-align: center; + -webkit-align-items: center; + align-items: center; + padding-left: 2px; + } + + .acea-row.row-column { + -webkit-box-orient: vertical; + -moz-box-orient: vertical; + -o-box-orient: vertical; + -webkit-flex-direction: column; + -ms-flex-direction: column; + flex-direction: column; + } + + .acea-row.row-center-wrapper { + -webkit-box-align: center; + -moz-box-align: center; + -o-box-align: center; + -ms-flex-align: center; + -webkit-align-items: center; + align-items: center; + -webkit-box-pack: center; + -moz-box-pack: center; + -o-box-pack: center; + -ms-flex-pack: center; + -webkit-justify-content: center; + justify-content: center; + } + + .merchantsSettled .list .item .pictrue { + width: 130rpx; + height: 130rpx; + margin: 24rpx 22rpx 0 0; + position: relative; + font-size: 11px; + color: #bbb; + + &:nth-child(4n) { + margin-right: 0; + } + + &:nth-last-child(1) { + border: 0.5px solid #ddd; + box-sizing: border-box; + } + + uni-image, + image { + width: 100%; + height: 100%; + border-radius: 1px; + + img { + -webkit-touch-callout: none; + -webkit-user-select: none; + -moz-user-select: none; + display: block; + position: absolute; + top: 0; + left: 0; + opacity: 0; + width: 100%; + height: 100%; + } + } + + .icon-guanbi1 { + font-size: 33rpx; + position: absolute; + top: -10px; + right: -10px; + } + } + + .uni-list-cell-db { + position: relative; + } + + .merchantsSettled .submitBtn { + width: 588rpx; + margin: 0 auto; + height: 86rpx; + + border-radius: 25px; + text-align: center; + line-height: 86rpx; + font-size: 15px; + color: #fff; + background: #E3E3E3; + margin-top: 25px; + pointer-events: none; + } + + .merchantsSettled .submitBtn.on { + background: red; + pointer-events: all; + } + + + .settlementAgreement { + width: 100%; + height: 100%; + position: fixed; + top: 0; + left: 0; + background: rgba(0, 0, 0, .5); + z-index: 10; + } + + .settlementAgreement .setAgCount { + background: #fff; + width: 656rpx; + // height: 458px; + position: absolute; + top: 50%; + left: 50%; + + padding: 52rpx; + -webkit-transform: translate(-50%, -50%); + -moz-transform: translate(-50%, -50%); + transform: translate(-50%, -50%); + overflow: hidden; + + .content { + height: 900rpx; + overflow-y: scroll; + + /deep/ p { + font-size: 13px; + line-height: 22px; + } + + /deep/ img { + max-width: 100%; + } + } + } + + .settlementAgreement .setAgCount .icon { + font-size: 42rpx; + color: #b4b1b4; + position: absolute; + top: 15rpx; + right: 15rpx; + } + + .settlementAgreement .setAgCount .title { + color: #333; + font-size: 32rpx; + text-align: center; + font-weight: bold; + } + + + .settlementAgreement .setAgCount .contenta { + + color: #333; + font-size: 26rpx; + line-height: 22px; + text-align: justify; + text-justify: distribute-all-lines; + height: 75%; + + overflow-y: scroll; + + + } + + .setAgCountbtn { + display: flex; + justify-content: space-around; + + .setAgCountbtna { + margin-top: 40rpx; + width: 200rpx; + height: 74rpx; + text-align: center; + line-height: 74rpx; + border-radius: 46rpx 46rpx; + opacity: 1; + border: 2rpx solid #B3B3B3; + font-size: 25rpx; + font-family: PingFang SC-Medium, PingFang SC; + font-weight: 500; + color: #737373; + + } + + .setAgCountbtnb { + margin-top: 40rpx; + padding-left: 20rpx; + padding-right: 20rpx; + + text-align: center; + line-height: 74rpx; + background: #cecece; + border-radius: 46rpx 46rpx; + opacity: 1; + font-size: 25rpx; + font-family: PingFang SC-Medium, PingFang SC; + font-weight: 500; + color: #fff; + + } + + .setAgCountbtnc { + margin-top: 40rpx; + width: 200rpx; + height: 74rpx; + text-align: center; + line-height: 74rpx; + background: linear-gradient(270deg, #FF6D20 0%, #F84221 100%); + border-radius: 46rpx 46rpx; + opacity: 1; + font-size: 25rpx; + font-family: PingFang SC-Medium, PingFang SC; + font-weight: 500; + color: #fff; + + } + } + + + .bg-img { position: absolute; width: 100%; @@ -546,7 +1402,48 @@ // margin-top: 52.63rpx; padding-top: 32rpx; border-radius: 17.54rpx; + // box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.16); + .special_work-title { + display: flex; + margin-bottom: 50rpx; + + background-color: #efefef; + padding: 10rpx 10rpx; + + .special_work-titlea { + width: 40rpx; + height: 40rpx; + + image { + width: 100%; + height: 100%; + } + } + + .special_work-titleb { + font-size: 23rpx; + font-family: PingFang SC-Regular, PingFang SC; + font-weight: 400; + color: #737373; + margin-top: 5rpx; + } + + .special_work-titlec { + font-size: 23rpx; + font-family: PingFang SC-Regular, PingFang SC; + font-weight: 400; + color: #16C295; + margin-top: 5rpx; + } + + .special_work-titled { + font-size: 23rpx; + font-family: PingFang SC-Regular, PingFang SC; + font-weight: 400; + margin-top: 5rpx; + } + } .title { font-size: 31.58rpx; diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue index d51d48d..f13d635 100644 --- a/pages/nongKe/cloud_entrepot/index.vue +++ b/pages/nongKe/cloud_entrepot/index.vue @@ -1,70 +1,41 @@