From 844aa73a5545b860531e007f628edd036f701133 Mon Sep 17 00:00:00 2001 From: 2509699674 <2509699647@qq.com> Date: Thu, 16 Jan 2025 11:03:08 +0800 Subject: [PATCH] '最新' --- admin-web-master/src/layout/index.vue | 7 +++---- admin-web-master/src/utils/request.js | 4 ++-- admin-web-master/src/utils/request2.js | 4 ++-- admin-web-master/src/views/serve/MarkActivity/index.vue | 979 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- admin-web-master/src/views/serve/Merchant/index.vue | 660 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ admin-web-master/src/views/serve/PerWorkstation/index.vue | 55 ++++++++++++++++++++++++++++++++++++++++++++----------- admin-web-master/src/views/serve/procedure.vue | 8 ++++---- ceres-uniapp-master/components/AliHbPay/index.vue | 4 ++-- ceres-uniapp-master/components/CashierList/index.vue | 6 +++--- ceres-uniapp-master/components/Empty/index.vue | 2 +- ceres-uniapp-master/components/activities/combinedSales.vue | 4 ++-- ceres-uniapp-master/components/basics/categoryShow.vue | 2 +- ceres-uniapp-master/components/canvasShow/basics/header/app/index.vue | 2 +- ceres-uniapp-master/components/canvasShow/basics/newProduct/app/index.vue | 4 ++-- ceres-uniapp-master/components/canvasShow/basics/product/app/index.vue | 8 ++++---- ceres-uniapp-master/components/goodsDetalils/coupon-popup.vue | 14 +++++++------- ceres-uniapp-master/components/hoteRecommed/index.vue | 2 +- ceres-uniapp-master/pages/tabbar/cart/index.vue | 20 ++++++++++---------- ceres-uniapp-master/pages/tabbar/category/index.vue | 8 ++++---- ceres-uniapp-master/pages/tabbar/index/index.vue | 6 +++--- ceres-uniapp-master/pages/tabbar/user/index.data.js | 24 ++++++++++++------------ ceres-uniapp-master/pages/tabbar/user/index.vue | 6 +++--- ceres-uniapp-master/pages_category_page1/coupon/22.vue | 4 ++-- ceres-uniapp-master/pages_category_page1/coupon/list.vue | 4 ++-- ceres-uniapp-master/pages_category_page1/coupon/product.vue | 4 ++-- ceres-uniapp-master/pages_category_page1/discount/discount.vue | 6 +++--- ceres-uniapp-master/pages_category_page1/discount/groupBuy.vue | 6 +++--- ceres-uniapp-master/pages_category_page1/discount/platformDiscount.vue | 8 ++++---- ceres-uniapp-master/pages_category_page1/discount/spikeList.vue | 4 ++-- ceres-uniapp-master/pages_category_page1/distributionModule/distributionOrder.vue | 6 +++--- ceres-uniapp-master/pages_category_page1/distributionModule/index.vue | 2 +- ceres-uniapp-master/pages_category_page1/distributionModule/invite.vue | 8 ++++---- ceres-uniapp-master/pages_category_page1/distributionModule/promotion.vue | 8 ++++---- ceres-uniapp-master/pages_category_page1/distributionModule/recruit.vue | 2 +- ceres-uniapp-master/pages_category_page1/distributionModule/salesIndex.vue | 8 ++++---- ceres-uniapp-master/pages_category_page1/distributionModule/shareProduct.vue | 10 +++++----- ceres-uniapp-master/pages_category_page1/distributionModule/totalAward.vue | 14 +++++++------- ceres-uniapp-master/pages_category_page1/distributionModule/totalClient.vue | 8 ++++---- ceres-uniapp-master/pages_category_page1/distributionModule/totalPersonnel.vue | 8 ++++---- ceres-uniapp-master/pages_category_page1/distributionModule/unliquidated.vue | 14 +++++++------- ceres-uniapp-master/pages_category_page1/goodsModule/addEvaluate.vue | 2 +- ceres-uniapp-master/pages_category_page1/goodsModule/canvasGoods.vue | 16 ++++++++-------- ceres-uniapp-master/pages_category_page1/goodsModule/combination.vue | 6 +++--- ceres-uniapp-master/pages_category_page1/goodsModule/components/GoodActivityDetail.vue | 18 +++++++++--------- ceres-uniapp-master/pages_category_page1/goodsModule/components/GoodEvaluateAndQuestion.vue | 10 +++++----- ceres-uniapp-master/pages_category_page1/goodsModule/couponShopList.vue | 6 +++--- ceres-uniapp-master/pages_category_page1/goodsModule/evaSuccessful.vue | 2 +- ceres-uniapp-master/pages_category_page1/goodsModule/evaluate.vue | 2 +- ceres-uniapp-master/pages_category_page1/goodsModule/evaluateDetails.vue | 12 ++++++------ ceres-uniapp-master/pages_category_page1/goodsModule/evaluateList.vue | 4 ++-- ceres-uniapp-master/pages_category_page1/goodsModule/goodsDetails.vue | 16 ++++++++-------- ceres-uniapp-master/pages_category_page1/goodsModule/goodsList.vue | 20 ++++++++++---------- ceres-uniapp-master/pages_category_page1/goodsModule/inviteSpell.vue | 2 +- ceres-uniapp-master/pages_category_page1/goodsModule/userEvaluate.vue | 16 ++++++++-------- ceres-uniapp-master/pages_category_page1/homeModule/special.vue | 4 ++-- ceres-uniapp-master/pages_category_page1/integral/exchangeDetail.vue | 4 ++-- ceres-uniapp-master/pages_category_page1/integral/index.vue | 22 +++++++++++----------- ceres-uniapp-master/pages_category_page1/integral/sign.vue | 8 ++++---- ceres-uniapp-master/pages_category_page1/memberCenter/activityList.vue | 4 ++-- ceres-uniapp-master/pages_category_page1/memberCenter/index.vue | 4 ++-- ceres-uniapp-master/pages_category_page1/memberCenter/memberSign.vue | 6 +++--- ceres-uniapp-master/pages_category_page1/orderModule/Intervene.vue | 2 +- ceres-uniapp-master/pages_category_page1/orderModule/addLogistics.vue | 4 ++-- ceres-uniapp-master/pages_category_page1/orderModule/afterSaleApplyRefund.vue | 32 ++++++++++++++++---------------- ceres-uniapp-master/pages_category_page1/orderModule/afterSaleApplyRetund.vue | 18 +++++++++--------- ceres-uniapp-master/pages_category_page1/orderModule/index.vue | 6 +++--- ceres-uniapp-master/pages_category_page1/orderModule/logisticsInfo.vue | 2 +- ceres-uniapp-master/pages_category_page1/orderModule/orderConfirm.vue | 30 +++++++++++++++--------------- ceres-uniapp-master/pages_category_page1/orderModule/orderConfirm334.vue | 24 ++++++++++++------------ ceres-uniapp-master/pages_category_page1/orderModule/orderDetails.vue | 18 +++++++++--------- ceres-uniapp-master/pages_category_page1/orderModule/paySuccessful.vue | 4 ++-- ceres-uniapp-master/pages_category_page1/orderModule/platformJoin.vue | 2 +- ceres-uniapp-master/pages_category_page1/search/index/index.vue | 10 +++++----- ceres-uniapp-master/pages_category_page1/store/index.vue | 38 +++++++++++++++++++------------------- ceres-uniapp-master/pages_category_page2/channelCoupon/index.vue | 18 +++++++++--------- ceres-uniapp-master/pages_category_page2/distributionModule/distributionOrder.vue | 6 +++--- ceres-uniapp-master/pages_category_page2/livePage/components/liveBox.vue | 2 +- ceres-uniapp-master/pages_category_page2/livePage/index.vue | 2 +- ceres-uniapp-master/pages_category_page2/orderModule/afterSale.vue | 6 +++--- ceres-uniapp-master/pages_category_page2/orderModule/refundDetails.vue | 2 +- ceres-uniapp-master/pages_category_page2/orderModule/returnDetails.vue | 2 +- ceres-uniapp-master/pages_category_page2/userModule/accountLogin.vue | 4 ++-- ceres-uniapp-master/pages_category_page2/userModule/addAddress.vue | 4 ++-- ceres-uniapp-master/pages_category_page2/userModule/address.vue | 6 +++--- ceres-uniapp-master/pages_category_page2/userModule/bankcard.vue | 6 +++--- ceres-uniapp-master/pages_category_page2/userModule/bindPhone.vue | 4 ++-- ceres-uniapp-master/pages_category_page2/userModule/collection.vue | 54 +++++++++++++++++++++++++++--------------------------- ceres-uniapp-master/pages_category_page2/userModule/coupon.vue | 6 +++--- ceres-uniapp-master/pages_category_page2/userModule/footprintList.vue | 30 +++++++++++++++--------------- ceres-uniapp-master/pages_category_page2/userModule/memberAccount.vue | 8 ++++---- ceres-uniapp-master/pages_category_page2/userModule/messageCenter.vue | 8 ++++---- ceres-uniapp-master/pages_category_page2/userModule/personalDetails.vue | 2 +- ceres-uniapp-master/pages_category_page2/userModule/questionList.vue | 30 +++++++++++++++--------------- ceres-uniapp-master/pages_category_page2/userModule/register.vue | 4 ++-- ceres-uniapp-master/pages_category_page2/userModule/unsubscribeCode.vue | 4 ++-- ceres-uniapp-master/pages_category_page2/userModule/withdraw.vue | 2 +- lvdao-miniapp/pages.json | 9 ++++++++- lvdao-miniapp/pages/activityAdd/activityAdd.vue | 45 ++++++++++++++++++++++++++++++++++++--------- lvdao-miniapp/pages/activityDetail/activityDetail.vue | 12 +++++++++--- lvdao-miniapp/pages/advertisement/advertisement.vue | 2 +- lvdao-miniapp/pages/business/businessDetail/businessDetail.vue | 38 +++++++++++++------------------------- lvdao-miniapp/pages/business/businessList/businessList.scss | 3 ++- lvdao-miniapp/pages/business/businessList/businessList.vue | 4 ++-- lvdao-miniapp/pages/home/home.vue | 7 ++++--- lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.scss | 5 ++++- lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.vue | 33 ++++++++++++++++++++------------- lvdao-miniapp/pages/marketing/marketingList/marketingList.vue | 67 ++++++++++++++++++++++++------------------------------------------- lvdao-miniapp/pages/message/message.vue | 42 ++++++++++++++++++++++++++++-------------- lvdao-miniapp/pages/my/my.vue | 12 ++++++++---- lvdao-miniapp/pages/mycreated/mycreated.vue | 18 ++++++++++++++++++ lvdao-miniapp/pages/participation/participation.scss | 4 ++++ lvdao-miniapp/pages/participation/participation.vue | 29 +++++++++++++++-------------- lvdao-miniapp/pages/procedureDetail/procedureDetail.vue | 87 --------------------------------------------------------------------------------------- lvdao-miniapp/pages/procedureList/procedureDetail.vue | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ lvdao-miniapp/pages/procedureList/procedureList.vue | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ lvdao-miniapp/pages/workbench/workbench.vue | 46 +++++++++++++++++----------------------------- lvdao-miniapp/utils/request.js | 8 ++++---- 117 files changed, 1823 insertions(+), 1399 deletions(-) delete mode 100644 lvdao-miniapp/pages/procedureDetail/procedureDetail.vue create mode 100644 lvdao-miniapp/pages/procedureList/procedureDetail.vue create mode 100644 lvdao-miniapp/pages/procedureList/procedureList.vue diff --git a/admin-web-master/src/layout/index.vue b/admin-web-master/src/layout/index.vue index a5113d6..e08729e 100644 --- a/admin-web-master/src/layout/index.vue +++ b/admin-web-master/src/layout/index.vue @@ -536,10 +536,9 @@ this.listMune[0] = All }, gzt(){ - // window.location.href = 'https://admin-uat.028wlkj.com:1020/' - // window.location.href = 'https://admin.028wlkj.com:1020/application-manage' - // window.location.href = 'https://admin-uat.028wlkj.com:1020' - window.location.href = 'https://admin.028wlkj.com:1020/application-manage' + + // window.location.href = 'https://admin-uat.028wlkj.com:1020/application-manage' + window.location.href = 'https://admin-uat.028wlkj.com:1020/application-manage' }, findMatchingNames(List,msg){ diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js index b681917..3553040 100644 --- a/admin-web-master/src/utils/request.js +++ b/admin-web-master/src/utils/request.js @@ -17,9 +17,9 @@ let baseURL = '' if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; - baseURL = 'http://192.168.2.152:9003'; + // baseURL = 'https://jy.scjysm.asia:18086/meserver/admin-server'; // baseURL = 'http://172.16.61.125:9003'; - // baseURL = 'http://192.168.2.36:9003'; + baseURL = 'http://10.0.0.51:9003'; // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; // baseURL = 'http://192.168.2.225:9003'; diff --git a/admin-web-master/src/utils/request2.js b/admin-web-master/src/utils/request2.js index 7a20c83..49f784b 100644 --- a/admin-web-master/src/utils/request2.js +++ b/admin-web-master/src/utils/request2.js @@ -17,8 +17,8 @@ let baseURL = '' // || host === 'localhost:9528' if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_2; - // baseURL = 'http://192.168.2.225:9003'; - baseURL = 'http://192.168.2.152:9004'; + baseURL = 'http://10.0.0.51:9004'; + // baseURL = 'https://jy.scjysm.asia:18086/merchant-business'; } else { console.error('---------------------') console.error(hostall) diff --git a/admin-web-master/src/views/serve/MarkActivity/index.vue b/admin-web-master/src/views/serve/MarkActivity/index.vue index 53f4799..4ac7ee0 100644 --- a/admin-web-master/src/views/serve/MarkActivity/index.vue +++ b/admin-web-master/src/views/serve/MarkActivity/index.vue @@ -1,6 +1,6 @@ @@ -84,6 +69,9 @@ export default { }, onLoad(option){ this.tableData = JSON.parse(option.item) + if (typeof this.tableData.previousEvents === 'string') { + this.tableData.previousEvents = this.tableData.previousEvents.split(','); + } console.log(this.tableData) }, methods: { diff --git a/lvdao-miniapp/pages/business/businessList/businessList.scss b/lvdao-miniapp/pages/business/businessList/businessList.scss index 7a65c7a..5a8a449 100644 --- a/lvdao-miniapp/pages/business/businessList/businessList.scss +++ b/lvdao-miniapp/pages/business/businessList/businessList.scss @@ -45,6 +45,7 @@ width: 100%; height: calc(100% - 70rpx); padding: 15rpx 18rpx; + justify-content: space-around; image { width: 194rpx; height: 144rpx; @@ -61,7 +62,7 @@ // white-space: nowrap; // overflow : hidden; // text-overflow: ellipsis; - margin-bottom: 30rpx; + margin-bottom: 70rpx; } .info-item { line-height: 30rpx; diff --git a/lvdao-miniapp/pages/business/businessList/businessList.vue b/lvdao-miniapp/pages/business/businessList/businessList.vue index 0e4a6ba..92fdaf0 100644 --- a/lvdao-miniapp/pages/business/businessList/businessList.vue +++ b/lvdao-miniapp/pages/business/businessList/businessList.vue @@ -12,9 +12,9 @@ {{v.title}} - + 2024-10-1 - + diff --git a/lvdao-miniapp/pages/home/home.vue b/lvdao-miniapp/pages/home/home.vue index 504ded7..bd5f284 100644 --- a/lvdao-miniapp/pages/home/home.vue +++ b/lvdao-miniapp/pages/home/home.vue @@ -281,12 +281,12 @@ - + {{item.title}} 活动日期：{{item.startTime}}至{{item.endTime}} - 举办方： + @@ -303,10 +303,11 @@ - + {{item.title}} + 合作类型:{{item.cooperationType}} diff --git a/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.scss b/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.scss index d1a7154..ced0478 100644 --- a/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.scss +++ b/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.scss @@ -40,6 +40,9 @@ // 活动信息 .info-box { margin-top: 30rpx; + background-color:#fff; + padding:10px; + border-radius: 30rpx; .title { font-weight: 700; color: #3D3D3D; @@ -66,7 +69,7 @@ padding-bottom: constant(safe-area-inset-bottom); padding-bottom: env(safe-area-inset-bottom); .footer-btn { - padding: 0 10%; + // padding: 0 10%; margin-top: 20rpx; } .footer-service { diff --git a/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.vue b/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.vue index 4bbdf22..2c433b7 100644 --- a/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.vue +++ b/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.vue @@ -4,24 +4,23 @@ - + 场地： + 起止时间：{{tableData.startTime}}至{{tableData.endTime}} + 联系人：{{tableData.contactPerson}} + 联系电话：{{tableData.contactPhone}} + 已参与报名人数：人 + @@ -33,7 +32,7 @@ 客服 --> - 报名参加 + 报名参加 - + 搜索 - + + + + + + - + {{item.title}} 活动时间：{{item.startTime}}至{{item.endTime}} - + + + + + @@ -44,25 +42,23 @@ status: 'loadmore', list: [], total: 1, - query: { + pagesize: { title: '', // 搜索项 - sortType: '', // 排序方式 - status: '', // 活动状态 - pageNumber:1, + orderingRule: 1, // 排序方式 + activeState: null, // 活动状态 + pageNumber:0, pageSize: 10, }, - sortshow: false, sortTypeOptions: [ - { label: '默认排序', value: 1 }, - { label: '正序', value: 2 }, - { label: '倒序', value: 3 }, + { label: '正序', value: 1 }, + { label: '倒序', value: 2 }, ], - statusshow: false, statusOptions: [ { label: '进行中', value: 1 }, { label: '已结束', value: 2 }, - { label: '未开始', value: 3 }, + { label: '未开始', value: 0 }, ], + }; }, onLoad() { @@ -85,13 +81,8 @@ this.getALL() }, methods: { - getALL(){ - let pagesize = { - pageNumber: 1, - pageSize: 2 - } - - this.$http.sendRequest('/cereMarketingActivity/queryByPage', 'POST', pagesize,1).then(res => { + getALL(val){ + this.$http.sendRequest('/cereMarketingActivity/queryByPage', 'POST', this.pagesize,1).then(res => { this.list =res.data.data.content }) }, @@ -102,17 +93,7 @@ }) }, search() { - this.$http.sendRequest('/cereMarketingActivity/queryByPage', 'POST', this.query,1).then(res => { - this.list =res.data.data.content - this.query ={ - title: '', // 搜索项 - sortType: '', // 排序方式 - status: '', // 活动状态 - pageNumber: 1, - pageSize: 10, - - } - }) + this.getALL() }, queryChange(key, val) { this.query[`${key}`] = val[0].value; diff --git a/lvdao-miniapp/pages/message/message.vue b/lvdao-miniapp/pages/message/message.vue index 6833881..3cc6772 100644 --- a/lvdao-miniapp/pages/message/message.vue +++ b/lvdao-miniapp/pages/message/message.vue @@ -31,7 +31,7 @@ - {{formatTime(tableList[0].createdAt)}} + {{formatDateTime(tableList[0].createdAt)}} @@ -25,12 +25,16 @@ - + {{item.activityName}} 活动日期：{{item.startTime}}至{{item.endTime}} 参与人数：{{item.maxParticipants}} - + + + + + @@ -53,19 +57,18 @@ total: 1, sortTypeOptions: [ - { label: '默认排序', value: 1 }, - { label: '正序', value: 2 }, - { label: '倒序', value: 3 }, + { label: '正序', value: 1 }, + { label: '倒序', value: 2 }, ], statusOptions: [ { label: '进行中', value: 1 }, { label: '已结束', value: 2 }, - { label: '未开始', value: 3 }, + { label: '未开始', value: 0 }, ], pageIndex :{ activityName: '', // 搜索项 - sortType: '', // 排序方式 - status: '', // 活动状态 + orderingRule: 1, // 排序方式 + activeState:null, // 活动状态 pageNumber: 1, pageSize: 10, auditStatus:'3', @@ -108,11 +111,9 @@ }, search() { - this.$http.sendRequest('/cereActivityApplication/queryByPage', 'POST',this.pageIndex,1).then(res => { - this.datalist = res.data.data.content - - }) + this.getAll() }, + loading() { let that = this if(that.status == 'nomore') return; diff --git a/lvdao-miniapp/pages/procedureDetail/procedureDetail.vue b/lvdao-miniapp/pages/procedureDetail/procedureDetail.vue deleted file mode 100644 index 318a5a5..0000000 --- a/lvdao-miniapp/pages/procedureDetail/procedureDetail.vue +++ /dev/null @@ -1,87 +0,0 @@ - - - - - \ No newline at end of file diff --git a/lvdao-miniapp/pages/procedureList/procedureDetail.vue b/lvdao-miniapp/pages/procedureList/procedureDetail.vue new file mode 100644 index 0000000..62af36c --- /dev/null +++ b/lvdao-miniapp/pages/procedureList/procedureDetail.vue @@ -0,0 +1,92 @@ + + + + + \ No newline at end of file diff --git a/lvdao-miniapp/pages/procedureList/procedureList.vue b/lvdao-miniapp/pages/procedureList/procedureList.vue new file mode 100644 index 0000000..4fbea3e --- /dev/null +++ b/lvdao-miniapp/pages/procedureList/procedureList.vue @@ -0,0 +1,122 @@ + + + + + \ No newline at end of file diff --git a/lvdao-miniapp/pages/workbench/workbench.vue b/lvdao-miniapp/pages/workbench/workbench.vue index 48b9d4d..32887ec 100644 --- a/lvdao-miniapp/pages/workbench/workbench.vue +++ b/lvdao-miniapp/pages/workbench/workbench.vue @@ -145,35 +145,23 @@ }; }, onShow() { - let shopId = { - shopId:uni.getStorageSync('shopId') || '' - } - const isLogin = uni.getStorageSync('token'); - if (isLogin =='') { - // 如果未登录，跳转到登录页面 - uni.navigateTo({ - url: '/pages/login/login' - }) - }else{ - let page={ - condition:2 - } - this.$http.sendRequest('/shop/getById', 'POST',shopId).then(res => { - if(res.data.code !="20004"){ - this.shopMsg = res.data.data - this.Islogin= false - this.$http.sendRequest('/index/index', 'POST',page).then(res => { - //成功回调 - this.tongji = res.data.data - }) - }else{ - uni.navigateTo({ - url: '/pages/login/login' - }) - } - }) - } - + const isLogin = uni.getStorageSync('token'); + if (isLogin == '') { + // 如果未登录，跳转到登录页面 + uni.navigateTo({ + url: '/pages/login/login' + }) + } else { + + this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},2).then(res => { + if(res.data.code == '20004'){ + uni.navigateTo({ + url: '/pages/login/login' + }) + } + }) + } + }, onReady() { uni.hideTabBar() diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js index 6072cba..7d537bc 100644 --- a/lvdao-miniapp/utils/request.js +++ b/lvdao-miniapp/utils/request.js @@ -16,18 +16,18 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { if(baseUrl == 1){ // bases = 'http://8.130.38.56:8027/admin-server' + url; // bases = 'http://172.16.61.125:9003' + url; - // bases = 'http://192.168.2.152:9003' + url; + bases = 'http://10.0.0.51:9003' + url; // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url; - bases = 'https://jy.scjysm.asia:18086/admin-server' + url; + // bases = 'https://jy.scjysm.asia:18086/admin-server' + url; }else{ // bases = 'http://8.130.38.56:8027/business-server' + url; // bases = 'http://172.16.61.48/business-server' + url; // bases = 'http://172.16.61.125:9004' + url; - // bases = 'http://192.168.2.152:9004' + url; + bases = 'http://10.0.0.51:9004' + url; // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url; - bases = 'https://jy.scjysm.asia:18086/merchant-business' + url; + // bases = 'https://jy.scjysm.asia:18086/merchant-business' + url; } var token = uni.getStorageSync('token') || ''; -- libgit2 0.21.4