From 4e9e9862dbbeaa935c7952ff08fa1dd7040a7535 Mon Sep 17 00:00:00 2001 From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com> Date: Tue, 2 Apr 2024 14:46:49 +0800 Subject: [PATCH] 1 --- App.vue | 94 +- api/store.js | 20 +- api/user.js | 8 + pages.json | 6 + pages/index/index.vue | 42 +- pages/index/unregist.vue | 106 ++ pages/product/shop_type_change/index.vue | 47 +- pages/store/home/index.vue | 1467 ++++++++++------------ pages/users/login/login_copy.vue | 84 +- pages/withdrawal/add.vue | 32 +- pages/withdrawal/index.vue | 76 +- utils/util.js | 13 + 12 files changed, 1071 insertions(+), 924 deletions(-) create mode 100644 pages/index/unregist.vue diff --git a/App.vue b/App.vue index 08adb30..a1c0a0f 100644 --- a/App.vue +++ b/App.vue @@ -16,13 +16,11 @@ checkLogin } from "./libs/login"; import { - getUserInfo - } from '@/api/user.js'; - import { - parseToken - } from "@/api/appLet.js"; + import { + parseToken + } from "@/api/appLet.js"; import { HTTP_REQUEST_URL } from './config/app'; @@ -32,7 +30,9 @@ history } from '@/api/public.js' import Routine from './libs/routine.js'; - import { Toast } from "./libs/uniApi"; + import { + Toast + } from "./libs/uniApi"; export default { data() { @@ -97,47 +97,47 @@ key: 'launchFlag' }) - // 用于调试中台登录 - // parseToken({ - // token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJjZXNoaS1taWRkbGUubGloYWluay5jbiIsImF1ZCI6ImNlc2hpLW1pZGRsZS5saWhhaW5rLmNuIiwiaWF0IjoxNzAwNjIwMjUxLCJuYmYiOjE3MDA2MjAyNTEsImV4cCI6MTcwMTIyNTA1MSwiZGF0YSI6eyJ1aWQiOjUsInBob25lIjoiMTc2ODUxNTE2NDMiLCJhdmF0YXIiOiIvcmVzb3VyY2UvaW1hZ2UvYWRtaW5hcGkvZGVmYXVsdC9kZWZhdWx0X2F2YXRhci5wbmciLCJuaWNrbmFtZSI6Ilx1NzUyOFx1NjIzNzE3Njg1MTUxNjQzIn19.sTWAHCScRY9FExwJw1MReHTnRBcK7tYu1AMSia_Sm4M' - // }).then((res)=>{ - // this.$store.commit("LOGIN", { - // 'token': res.data.token, - // 'time': 604800 - // }); - // this.$isResolve() - // }).catch((err)=>{ - // if(err=='签名错误'){ - // this.$store.commit("LOGIN", { - // 'token': option.referrerInfo?.extraData?.uniMP, - // 'time': 604800 - // }); - // }else { - // Toast(err); - // } - // this.$isResolve() - // }) + // 用于调试中台登录 + // parseToken({ + // token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJjZXNoaS1taWRkbGUubGloYWluay5jbiIsImF1ZCI6ImNlc2hpLW1pZGRsZS5saWhhaW5rLmNuIiwiaWF0IjoxNzAwNjIwMjUxLCJuYmYiOjE3MDA2MjAyNTEsImV4cCI6MTcwMTIyNTA1MSwiZGF0YSI6eyJ1aWQiOjUsInBob25lIjoiMTc2ODUxNTE2NDMiLCJhdmF0YXIiOiIvcmVzb3VyY2UvaW1hZ2UvYWRtaW5hcGkvZGVmYXVsdC9kZWZhdWx0X2F2YXRhci5wbmciLCJuaWNrbmFtZSI6Ilx1NzUyOFx1NjIzNzE3Njg1MTUxNjQzIn19.sTWAHCScRY9FExwJw1MReHTnRBcK7tYu1AMSia_Sm4M' + // }).then((res)=>{ + // this.$store.commit("LOGIN", { + // 'token': res.data.token, + // 'time': 604800 + // }); + // this.$isResolve() + // }).catch((err)=>{ + // if(err=='签名错误'){ + // this.$store.commit("LOGIN", { + // 'token': option.referrerInfo?.extraData?.uniMP, + // 'time': 604800 + // }); + // }else { + // Toast(err); + // } + // this.$isResolve() + // }) if (option?.referrerInfo?.extraData?.uniMP) { uni.setStorageSync('uniMP', option.referrerInfo?.extraData?.uniMP); - parseToken({ - token: option.referrerInfo?.extraData?.token - }).then((res)=>{ - this.$store.commit("LOGIN", { - 'token': res.data.token, - 'time': 604800 - }); - this.$isResolve() - }).catch((err)=>{ - this.$store.commit("LOGIN", { - 'token': option.referrerInfo?.extraData?.token, - 'time': 604800 - }); - this.$isResolve() - }) - }else { - this.$isResolve() - } + parseToken({ + token: option.referrerInfo?.extraData?.token + }).then((res) => { + this.$store.commit("LOGIN", { + 'token': res.data.token, + 'time': 604800 + }); + this.$isResolve() + }).catch((err) => { + this.$store.commit("LOGIN", { + 'token': option.referrerInfo?.extraData?.token, + 'time': 604800 + }); + this.$isResolve() + }) + } else { + this.$isResolve() + } // #ifdef APP-PLUS // #endif @@ -431,6 +431,12 @@ box-sizing: border-box; } + .c_active { + &:active { + opacity: .8; + } + } + .custom_style { color: #fff; display: flex; diff --git a/api/store.js b/api/store.js index fbd93b6..26166b4 100644 --- a/api/store.js +++ b/api/store.js @@ -1,5 +1,16 @@ import request from "@/utils/request.js"; +/** + * 获取商铺云商品列表 + * @param {Object} id 商铺 id + * @param {Object} data 商铺商品列表数据 + */ +export function getStoreCloudGoods(id, data) { + return request.get("product/spu/merchant/" + id + "/merCloudProduct", data, { + noAuth: true + }); +} + /** * 扫码查询商品 * @@ -595,8 +606,7 @@ export function vicinityStoreApi(data) { 商家入驻 -- 获取商户入驻申请协议内容 */ export function agreeiness(data) { - return request.get(`business/agree`, data, { noAuth: true }); -} - - - + return request.get(`business/agree`, data, { + noAuth: true + }); +} \ No newline at end of file diff --git a/api/user.js b/api/user.js index 6d01c74..229ca81 100644 --- a/api/user.js +++ b/api/user.js @@ -12,6 +12,14 @@ import request1 from "@/utils/requestb.js"; import Cache from '@/utils/cache' +/** + * 报错信息记录 + */ +export function errorReport(data) { + return request.post(`api/err/report`, data); +} + + /** * 提现----查询单条信息 */ diff --git a/pages.json b/pages.json index c0d67be..5365cdc 100644 --- a/pages.json +++ b/pages.json @@ -78,6 +78,12 @@ "scrollIndicator": false //禁用原生导航栏 } } + }, { + "path": "pages/index/unregist", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom" + } }, { "path": "pages/nongKe/supply_chain/shopping_trolley", diff --git a/pages/index/index.vue b/pages/index/index.vue index 5606db9..f6db902 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -901,7 +901,20 @@ handleToWithDraw(item, index) { if (index == 4) return; let url; - if (index == 0) url = "/pages/users/embody/embody?mer_id=" + this.userInfoData.service.mer_id; + if (index == 0) { + progressBankList(this.userInfoData.service.mer_id).then(res => { + const data = res.data.list || []; + if ((data.length == 1 && data[0].is_check === 0) || (data.length == 2 && data[ + 0].is_check === 0 && data[1].is_check === 0)) { + url = '/pages/withdrawal/progress?mer_id=' + this.userInfoData.service.mer_id + } else { + url = '/pages/withdrawal/index?mer_id=' + this.userInfoData.service.mer_id + } + return uni.navigateTo({ + url: url + }) + }) + } if (index == 2) url = `/pages/admin/orderList/index?merId=${this.userInfoData.service.mer_id}&types=`; if (index == 3) url = "/pages/activeCode/subsidy"; @@ -1333,17 +1346,21 @@ this.isgShow = true } if (res.data.mer_info.length == 0) { - uni.showModal({ - title: '暂未开通商户', - complete(res) { - // #ifdef APP-PLUS - uni.sendHostEvent('closeApp', (ret) => { - //发送消息成功回调 - console.log('关闭应用' + JSON.stringify(ret)); - }); - // #endif - } + //未开通商户 提示 + uni.reLaunch({ + url: "/pages/index/unregist" }) + // uni.showModal({ + // title: '暂未开通商户', + // complete(res) { + // // #ifdef APP-PLUS + // uni.sendHostEvent('closeApp', (ret) => { + // //发送消息成功回调 + // console.log('关闭应用' + JSON.stringify(ret)); + // }); + // // #endif + // } + // }) } else { this.getindex() this.getGoods(true) @@ -1482,9 +1499,6 @@ // 是否有一个银行卡在申请 或者两个银行卡在申请 progressBankList(this.userInfoData.service.mer_id).then(res => { const data = res.data.list || []; - - console.log(data.length == 1 && data[0].is_check === 0) - if ((data.length == 1 && data[0].is_check === 0) || (data.length == 2 && data[ 0].is_check === 0 && data[1].is_check === 0)) { uni.navigateTo({ diff --git a/pages/index/unregist.vue b/pages/index/unregist.vue new file mode 100644 index 0000000..2864be0 --- /dev/null +++ b/pages/index/unregist.vue @@ -0,0 +1,106 @@ + + + + + + \ No newline at end of file diff --git a/pages/product/shop_type_change/index.vue b/pages/product/shop_type_change/index.vue index b6c7c88..6b9a747 100644 --- a/pages/product/shop_type_change/index.vue +++ b/pages/product/shop_type_change/index.vue @@ -18,18 +18,26 @@ 点击选择变更的商户类型 + + 升级为批发商户 + 备注:批发商户仅能销售批发价产品,产品仅展示在批发-供销云市场批发类目 + + src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/d8a38202404011735139115.webp" mode=""> + src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/145e2202404011734207958.webp" mode=""> + + 升级为批发/零售商户 + 备注:批发/零售商户可以进行批发与零售交易,产品可在供销云市场全面展示 + + src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/a9447202404011734582066.webp" mode=""> + src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/19c0b202404011735289980.webp" mode=""> @@ -52,12 +60,10 @@ }, onLoad(opt) { - if (opt.mer_id) - this.mer_id = opt.mer_id; + if (opt.mer_id) this.mer_id = opt.mer_id; }, methods: { - handleToRecord() { uni.navigateTo({ url: "/pages/product/shop_type_change/list?mer_id=" + this.mer_id, @@ -173,20 +179,43 @@ display: flex; justify-content: center; margin-bottom: 30rpx; + position: relative; image { width: 690rpx; - height: 178rpx; + height: 200rpx; } } .pifalingshou { + position: relative; display: flex; justify-content: center; image { width: 690rpx; - height: 178rpx; + height: 200rpx; + } + } + + .pifa-title { + position: absolute; + z-index: 10; + padding-top: 36rpx; + margin-left: 202rpx; + width: 464rpx; + + .main-title { + margin-bottom: 14rpx; + font-weight: 600; + font-size: 30rpx; + color: #333333; + } + + .sub-title { + font-size: 24rpx; + color: #555555; + line-height: 45rpx; } } } diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue index d09d034..3fcae29 100644 --- a/pages/store/home/index.vue +++ b/pages/store/home/index.vue @@ -1,243 +1,102 @@ - \ No newline at end of file diff --git a/utils/util.js b/utils/util.js index 74b8c5d..c4bc796 100644 --- a/utils/util.js +++ b/utils/util.js @@ -21,7 +21,20 @@ import { // #ifdef APP-PLUS import permision from "./permission.js" // #endif + +import { + errorReport +} from "@/api/user.js"; + + export default { + + errorSave: function(a, b) { + errorReport({ + route: a, + msg: b + }) + }, // 是否设置密码 checkPassword: async function(e) { e = e ? e : '';