diff --git a/App.vue b/App.vue index b5bfc38..d56d2d7 100644 --- a/App.vue +++ b/App.vue @@ -10,7 +10,7 @@ // +---------------------------------------------------------------------- // #ifdef APP-PLUS let jpushModule = uni.requireNativePlugin("JG-JPush"); - const mp = uni.requireNativePlugin('uniMP'); + import { initEvent } from "@/utils/uniMPevent.js"; // #endif import { checkLogin @@ -86,17 +86,24 @@ } // #ifdef APP-PLUS - //监听uni小程序发送的事件 - mp.onUniMPEventReceive(ret => { - console.log('小程序事件: ', ret); - if (ret.event == 'closeApp') { - mp.closeUniMP(ret.fromAppid, (ret) => { - console.log('closeUniMP: ' + JSON.stringify(ret)); - }); - } - }); + //初始化uniMP小程序发送的事件以及其他操作 + initEvent(); // #endif + // uni.getLocation({ + // type: 'gcj02', + // geocode: true, + // isHighAccuracy: true, + // // altitude: true, + // // accuracy: 'best', + // success: (res)=> { + // console.log(res); + // }, + // fail(e) { + // console.log(e); + // } + // }); + let that = this; // #ifdef MP if (HTTP_REQUEST_URL == '') { @@ -157,6 +164,7 @@ // console.log("jpush连接", connectEnable) }) + // 设置别名 // jpushModule.setAlias({ // 'alias': uni.getStorageSync('userId'), diff --git a/api/api.js b/api/api.js index 6877e42..7d9d20c 100644 --- a/api/api.js +++ b/api/api.js @@ -290,4 +290,18 @@ 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); +} 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..3659801 100644 --- a/api/store.js +++ b/api/store.js @@ -577,6 +577,9 @@ export function vicinityStoreApi(data) { /* 商家入驻 -- 获取商户入驻申请协议内容 */ -export function agreeiness() { - return request.get(`business/agree?type=sys_intention_agree`, {}, { noAuth: true }); -} \ No newline at end of file +export function agreeiness(data) { + return request.get(`business/agree`, data, { noAuth: true }); +} + + + 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/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..d3e66d2 100644 --- a/config/app.js +++ b/config/app.js @@ -6,31 +6,59 @@ 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' // 生产 - // 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' + break; + case 'prew': + httpApi = 'https://test.shop.lihaink.cn' //预发布环境 + httpApiTwo = "https://nk.lihaink.cn" + httpApiThree = 'http://ceshi-oa.lihaink.cn' + break; + default: + httpApi = "https://crmeb-test.shop.lihaink.cn" // 生产 + httpApiTwo = "https://nk.lihaink.cn" + httpApiThree = 'http://ceshi-oa.lihaink.cn' } + + +// // 网络接口修改此字符 小程序域名要求https +// // let httpApi = 'http://192.168.31.110:8324' // 测试 +// if (process.env.NODE_ENV === "development") { +// httpApi = 'https://shop.lihaink.cn' // 生产 +// // httpApi = 'https://test.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' // 生产 + +// // httpApi ='https://test.shop.lihaink.cn' //预发布环境 + +// // httpApi = "https://crmeb-test.shop.lihaink.cn" +// httpApiTwo = 'https://nk.lihaink.cn' // 生产 +// httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产 +// } // httpApi = 'https://shop.lihaink.cn' // 生产 // httpApiTwo = 'https://nk.lihaink.cn' // 生产 diff --git a/manifest.json b/manifest.json index c61eaac..d51d063 100644 --- a/manifest.json +++ b/manifest.json @@ -95,8 +95,8 @@ "sdkConfigs" : { "maps" : { "amap" : { - "appkey_ios" : "048d9f3f323eea894b49c3a7edbc8d87", - "appkey_android" : "048d9f3f323eea894b49c3a7edbc8d87" + "appkey_ios" : "82af93ec51139c712c4118d84ba684ee", + "appkey_android" : "0799f37420c0784f1e6cba230a68bdb1" } }, "payment" : { @@ -113,8 +113,10 @@ } }, "geolocation" : { - "system" : { - "__platform__" : [ "ios", "android" ] + "amap" : { + "__platform__" : [ "ios", "android" ], + "appkey_ios" : "82af93ec51139c712c4118d84ba684ee", + "appkey_android" : "0799f37420c0784f1e6cba230a68bdb1" } }, "oauth" : {}, diff --git a/pages.json b/pages.json index 1b5612c..ea535c2 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", @@ -128,26 +128,34 @@ "enablePullDownRefresh": false } + }, { + "path": "uni_modules/guyue-updater/pages/updater", + "style": { + "app-plus": { + "animationDuration": 200, + "animationType": "fade-in", + "background": "transparent", + "backgroundColorTop": "transparent", + "bounce": "none", + "popGesture": "none", + "scrollIndicator": false, + "titleNView": false + }, + "backgroundColor": "transparent", + "disableScroll": true, + "navigationStyle": "custom" + } } - ,{ - "path": "uni_modules/guyue-updater/pages/updater", - "style": { - "app-plus": { - "animationDuration": 200, - "animationType": "fade-in", - "background": "transparent", - "backgroundColorTop": "transparent", - "bounce": "none", - "popGesture": "none", - "scrollIndicator": false, - "titleNView": false - }, - "backgroundColor": "transparent", - "disableScroll": true, - "navigationStyle": "custom" - } -} -], + ,{ + "path" : "pages/margin/margin", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + } + ], "subPackages": [{ "root": "pages/goods_cate", "name": "goods_cate", @@ -1123,18 +1131,6 @@ "navigationBarTitleText": "商品管理", "enablePullDownRefresh": true } - },{ - "path": "transactionApplication/index", - "style": { - "navigationBarTitleText": "交易申请", - "enablePullDownRefresh": false - } - },{ - "path": "transactionApplication/application", - "style": { - "navigationBarTitleText": "申请记录", - "enablePullDownRefresh": false - } }, { "path": "goodsOnSale/index", @@ -1637,7 +1633,7 @@ "iconPath": "static/tabbar_icon/c.png", "selectedIconPath": "static/tabbar_icon/c-a.png", "text": "发布" - + }, { "pagePath": "pages/supply_chains/supply_chains", @@ -1653,7 +1649,7 @@ "text": "我的" } ] - + diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue index 9f6bc78..bb740c1 100644 --- a/pages/gather/gather.vue +++ b/pages/gather/gather.vue @@ -30,7 +30,7 @@ - + @@ -141,7 +141,7 @@ }, prefix: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/11/', isShow: false, - bgColor: '', + isFshow: false, street: '', // 编辑中标记 @@ -164,7 +164,7 @@ street: '', showPicker: false, columnData: [], - bgColor: '', + isFshow: false, backColor: 'rgba(252, 252, 252, 0)' }; @@ -291,6 +291,7 @@ this.getUniMp(data); break; case 2: + this.navigator(data); break; } @@ -408,10 +409,6 @@ }, - kkchange(e) { - this.bgColor = e - }, - navigator(url, t) { // if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息"); uni.navigateTo({ diff --git a/pages/margin/margin.vue b/pages/margin/margin.vue new file mode 100644 index 0000000..a1f7188 --- /dev/null +++ b/pages/margin/margin.vue @@ -0,0 +1,256 @@ + + + + + + \ No newline at end of file diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue index 6273d13..acfab95 100644 --- a/pages/moreProject/moreProject.vue +++ b/pages/moreProject/moreProject.vue @@ -1,10 +1,23 @@ @@ -382,15 +535,16 @@ import emptyPage from '@/components/emptyPage.vue'; import zbpSwiper from '@/components/zbpSwiper' import { - mapState, + mapGetters } from 'vuex' import { - getWorkArticleCount, - getSlideAPI - } from '@/api/article.js' + business, + intention, + intentionbus + } from "@/api/product" import { - getStoreList, + merstreet, getUserInfo } from '@/api/user.js' import { @@ -402,7 +556,9 @@ Toast } from '@/libs/uniApi'; import { - getDiy + getDiy, + merchant, + paymerchant } from '@/api/api.js' export default { @@ -413,6 +569,8 @@ }, data() { return { + company: '', + organization_code:'', locationArr: ({}), emptyText: '暂无可用应用', jurisdiction: false, // 是否有权限 @@ -426,11 +584,32 @@ 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: '' + }, + }; }, computed: { - ...mapGetters(['userInfo', 'location', 'isLogin']) + ...mapGetters(['userInfo', 'isLogin']) }, created() {}, onLoad() {}, @@ -443,109 +622,266 @@ this.jurisdiction = true } this.getUserInfo() - this.appLocation() - }, - onPullDownRefresh() { - this.getUserInfo() - uni.stopPullDownRefresh() - }, - mounted() { - this.appLocation() + this.codelist() + this.list() + }, + + methods: { - - - - //获取定位 - appLocation() { - uni.getLocation({ - type: 'wgs84', - timeout: '10', - success: (res) => { - // console.log(res) - - let latitude, longitude; - latitude = res.latitude.toString(); - longitude = res.longitude.toString(); - getGeocoder({ - lat: latitude, - long: longitude - }).then(res => { - this.street = res.data.address_component.street - Cache.set('ADRESS_LOCATION', this.street) - }).catch(err => { - uni.showToast({ - title: err, - icon: 'none' - }) - }) - }, - fail: (err) => { - - // uni.showToast({ - // title: "获取定位超时", - // icon: 'none', - // duration: 2000 - // }); - } - }); + //关闭弹窗 + close() { + this.$refs.popup.close() + this.num = 15 }, - - scrolling() { - // 滚动条距文档顶部的距离 - let scrollTop = - window.pageYOffset || - document.documentElement.scrollTop || - document.body.scrollTop; - // 滚动条滚动的距离 - let scrollStep = scrollTop - this.oldScrollTop; - console.log("header 滚动距离 ", scrollTop); - // 更新——滚动前，滚动条距文档顶部的距离 - this.oldScrollTop = scrollTop; - - //变量windowHeight是可视区的高度 - let windowHeight = - document.documentElement.clientHeight || document.body.clientHeight; - //变量scrollHeight是滚动条的总高度 - let scrollHeight = - document.documentElement.scrollHeight || document.body.scrollHeight; - - //滚动条到底部的条件 - if (scrollTop + windowHeight == scrollHeight) { - //你想做的事情 - console.log("header 你已经到底部了"); - } - if (scrollStep < 0) { - this.isFshow = false - console.log("header 滚动条向上滚动了！"); - } else { - this.isFshow = true - console.log("header 滚动条向下滚动了！"); - } - // 判断是否到了最顶部 - if (scrollTop <= 0) { - this.isFshow = false - console.log("header 到了最顶部") - } - }, - - kkchange(e) { - this.bgColor = e - }, - - navigator(url, t) { - // if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息"); - uni.navigateTo({ - url: url + //获取交易信息 + 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 + + // intentionbus({ + // "status": 1 + // }).then((res) => { + // if (res.status == 200) { + // this.$util.Tips({ + // title: res.message, + // icon: 'success', + // }) + // this.getUserInfo() + // this.isFshow = false + // } + // }).catch((err) => { + // this.isFshow = false + // this.$util.Tips({ + // title: err, + // icon: 'error', + // }) + // }) + }, + //拒绝 + 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) { + uni.navigateTo({ + url: url+`?mer_id=` + this.mer_id + }) + }, + //商户设置 + 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) { + 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 @@ -559,7 +895,16 @@ } // console.log(that.userInfoData); }); - } + }, + + //获取协议内容 + list() { + business({ + type: 'mer_settlement_agree' + }).then(res => { + this.detail = res.data + }) + }, } }; @@ -569,6 +914,378 @@ background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%); } + .userpage { + width: 100%; + height: 1368rpx; + padding-top: 150rpx; + background-color: #fff; + position: relative; + } + + .userpage-icon { + width: 60rpx; + height: 60rpx; + position: absolute; + top: 60rpx; + right: 60rpx; + + image { + width: 100%; + height: 100%; + } + } + + .item-name { + width: 190rpx; + } + + .merchantsSettled { + height: 1368rpx; + } + + .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; + + width: calc(100% - 30px); + + } + + .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 .content { + margin-top: 32rpx; + color: #333; + font-size: 26rpx; + line-height: 22px; + text-align: justify; + text-justify: distribute-all-lines; + height: 1050rpx; + overflow-y: scroll; + } + + + .settlementAgreement .setAgCount .contenta { + margin-top: 32rpx; + color: #333; + font-size: 26rpx; + line-height: 22px; + text-align: justify; + text-justify: distribute-all-lines; + + height: 1050rpx; + + 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%; @@ -642,7 +1359,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 8ac621a..aa43f0d 100644 --- a/pages/nongKe/cloud_entrepot/index.vue +++ b/pages/nongKe/cloud_entrepot/index.vue @@ -35,7 +35,9 @@ - + {{street}} @@ -43,9 +45,8 @@ - - 全部 @@ -87,13 +88,13 @@ - - 全部 + @@ -483,13 +484,7 @@ this.Area() let that = this setTimeout(() => { - uni.createSelectorQuery() - .in(this) - .select('.flags') - .boundingClientRect(rect => { - that.headtop = rect.top - }) - .exec(); + uni.createSelectorQuery() .in(this) .select('.flags') @@ -502,7 +497,8 @@ .select('.cart') .boundingClientRect(rect => { // console.log(this.cartTagInfo, 6666) - this.cartTagInfo = rect + that.cartTagInfo = rect + console.log(rect) }) .exec(); // console.log(that.headtop) @@ -571,6 +567,15 @@ } }) .exec(); + uni.createSelectorQuery() + .in(this) + .select('.cart') + .boundingClientRect(rect => { + // console.log(this.cartTagInfo, 6666) + that.cartTagInfo = rect + // console.log(rect) + }) + .exec(); }, onPullDownRefresh() { this.getCloundShop() @@ -824,9 +829,10 @@ spread_id: "", } let that = this + uni.createSelectorQuery().in(this).select(`.act_class${i}`).boundingClientRect(data1 => { - that.trnList[i].left = this.cartTagInfo.left - data1.left; - that.trnList[i].bottom = this.cartTagInfo.top - data1.top; + that.trnList[i].left = that.cartTagInfo.left - data1.left; + that.trnList[i].bottom = that.cartTagInfo.top - data1.top; let timer = setTimeout(() => { that.trnList[i].left = 0 diff --git a/pages/nongKe/food/index.vue b/pages/nongKe/food/index.vue index b44fcd1..27e954a 100644 --- a/pages/nongKe/food/index.vue +++ b/pages/nongKe/food/index.vue @@ -11,7 +11,7 @@ - + 当地美食 @@ -24,7 +24,7 @@ + src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"> diff --git a/pages/nongKe/specialty/index.vue b/pages/nongKe/specialty/index.vue index 8ed58d4..71ad4dc 100644 --- a/pages/nongKe/specialty/index.vue +++ b/pages/nongKe/specialty/index.vue @@ -11,7 +11,7 @@ - + 名优特产 @@ -27,7 +27,7 @@ + src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"> diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue index 3f6a627..c0dea0a 100644 --- a/pages/nongKe/supply_chain/supplier.vue +++ b/pages/nongKe/supply_chain/supplier.vue @@ -14,7 +14,7 @@ - + 供销综合云市场 - + {{titName}} @@ -26,7 +26,7 @@ + src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"> diff --git a/pages/nongKe/tourism/index.vue b/pages/nongKe/tourism/index.vue index ca5f9e8..d40a5ea 100644 --- a/pages/nongKe/tourism/index.vue +++ b/pages/nongKe/tourism/index.vue @@ -11,7 +11,7 @@ - + 特色文旅 @@ -27,7 +27,7 @@ + src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"> diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue index e7e1565..b108a18 100644 --- a/pages/product/basicSet.vue +++ b/pages/product/basicSet.vue @@ -173,7 +173,7 @@ - - \ No newline at end of file diff --git a/pages/product/transactionApplication/index.vue b/pages/product/transactionApplication/index.vue deleted file mode 100644 index 84da1c1..0000000 --- a/pages/product/transactionApplication/index.vue +++ /dev/null @@ -1,241 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue index 072b5da..17b4b3e 100644 --- a/pages/store/home/index.vue +++ b/pages/store/home/index.vue @@ -618,6 +618,12 @@ value: 2, } ], + tabs5: [{ + icon: 'icon-yizhan_o', + name: '云商品', + value: 7, + } + ], tabs: [], storeScroll: true, storeTop: 0, @@ -627,7 +633,8 @@ service_open: false, type: 3, statusBarHeight: 0, - isLihaiYun: '' + isLihaiYun: '', + business_status:0 } }, computed: { @@ -768,8 +775,15 @@ this.storeHeight = data.height; this.storeTop = data.top; }).exec(); + this.userinfo() }, methods: { + userinfo(){ + getUserInfo().then(res => { + + this.business_status=res.data.mer_info.business_status + }) + }, getProductSpu() { let that = this; if (that.loadend) return; @@ -954,7 +968,12 @@ // this.tabs = this.tabs2 // this.service_open = false // } - this.isLihaiYun === 'Lihai' ? this.tabs = this.tabs4 : this.tabs = this.tabs3 + if(this.business_status==2){ + this.isLihaiYun === 'Lihai' ? this.tabs = this.tabs4 : this.tabs = this.tabs3 + }else{ + this.tabs = this.tabs5 + } + this.tab(this.type) // #ifdef H5 this.ShareInfo(); diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue index 2370a6b..430c2d5 100644 --- a/pages/store/settled/index.vue +++ b/pages/store/settled/index.vue @@ -126,8 +126,8 @@ 法人名称 - + @@ -192,11 +192,14 @@ - - -
商户入驻协议
+ + +
{{detail.title}}
+ 甲方公司:{{company?company:"暂无公司信息"}} + 机构代码:{{organization_code?organization_code:"暂无公司信息"}} + - + @@ -204,8 +207,7 @@ 拒绝 - -