From 726bc80b118ccc771499ab380a807f6b62589484 Mon Sep 17 00:00:00 2001 From: yangxin <2509699647@qq.com> Date: Mon, 7 Apr 2025 14:55:40 +0800 Subject: [PATCH] 最新 --- admin-web-master/src/api/commodityLease.js | 14 ++++++++++++++ admin-web-master/src/components/add/addmap.vue | 27 +++++++++++++++++---------- admin-web-master/src/components/chakan/cd.vue | 4 +++- admin-web-master/src/components/chakan/map.vue | 16 ++++++++-------- admin-web-master/src/components/chakan/zl.vue | 18 ++++++++++++------ admin-web-master/src/utils/request.js | 2 +- admin-web-master/src/utils/request2.js | 4 ++-- admin-web-master/src/views/comment/commentSys/index.vue | 8 ++++---- admin-web-master/src/views/online/QRCode/index.vue | 34 +++++++--------------------------- admin-web-master/src/views/online/QRFunds/index.vue | 36 +++++++++--------------------------- admin-web-master/src/views/online/reconciliationProcessing/index.vue | 4 ++-- admin-web-master/src/views/shopRental/rentTermination/add.vue | 43 ++++++++++++++++++++++++++++++++----------- 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/canvasShow/config/api.js | 2 +- ceres-uniapp-master/components/goodsDetalils/coupon-popup.vue | 14 +++++++------- ceres-uniapp-master/components/hoteRecommed/index.vue | 2 +- ceres-uniapp-master/config/api.js | 14 +++++++------- ceres-uniapp-master/main.js | 10 ++++++---- 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 | 20 ++++++++++---------- 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 | 18 +++++++++--------- 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 | 34 ++++++++++++++++++++-------------- 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/login.vue | 4 ++-- 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 | 4 ++-- 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/main.js | 8 ++++---- lvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue | 38 +++++++++++++++++++------------------- lvdao-miniapp/pages/message/message.vue | 2 +- lvdao-miniapp/utils/request.js | 12 ++++++------ merchant-web-master/src/utils/request.js | 4 ++-- merchant-web-master/src/utils/request2.js | 4 ++-- merchant-web-master/src/views/comprehensive/productInventory/index.vue | 4 ++-- merchant-web-master/src/views/comprehensive/productOutbound/index.vue | 4 ++-- merchant-web-master/src/views/order/aftersale/afterDetails.vue | 3 +++ 114 files changed, 590 insertions(+), 567 deletions(-) diff --git a/admin-web-master/src/api/commodityLease.js b/admin-web-master/src/api/commodityLease.js index 406b1d0..7bb764d 100644 --- a/admin-web-master/src/api/commodityLease.js +++ b/admin-web-master/src/api/commodityLease.js @@ -56,4 +56,18 @@ export function cereTerminateNotice(data) { method: 'post', data }) +} + +// 上传minio + +export function uploadQuestion(data) { + return request({ + url: '/miniio/uploadQuestion', + method: 'post', + data, + headers: { + 'Content-Type': 'multipart/form-data' + } + + }) } \ No newline at end of file diff --git a/admin-web-master/src/components/add/addmap.vue b/admin-web-master/src/components/add/addmap.vue index 30bffc1..0db9e4a 100644 --- a/admin-web-master/src/components/add/addmap.vue +++ b/admin-web-master/src/components/add/addmap.vue @@ -18,14 +18,14 @@ :key="index" :label="item.label" :value="item.value"> - + + + @@ -149,7 +149,7 @@ import { miniioupload } from '../../api/commodityLease.js' - import { addList } from '@/api/map1.js'; + import { addList ,editList} from '@/api/map1.js'; import wangEditor from "@/components/editor/index" import { lvdaoduan, @@ -232,11 +232,11 @@ message: '请选择所属端', trigger: ['change'] }], - rotationOrder: [{ - required: true, - message: '请选择轮播顺序', - trigger: ['change'] - }], + // rotationOrder: [{ + // required: true, + // message: '请选择轮播顺序', + // trigger: ['change'] + // }], carouselId: [{ required: true, message: '请选择轮播图', @@ -364,6 +364,13 @@ }, methods: { + handleSelectChange(value){ + console.log(value) + const selectedIndex = this.tableData.findIndex(item => item.id === value); + if (selectedIndex!== -1) { + this.formInline.rotationOrder = '第' + (selectedIndex + 1) + '张'; + } + }, validateNumber(field, value) { // 使用正则表达式确保输入的是数字，并且可以包含最多两位小数 const regex = /^\d+(\.\d{1,2})?$/; diff --git a/admin-web-master/src/components/chakan/cd.vue b/admin-web-master/src/components/chakan/cd.vue index 7b635af..0fb53c2 100644 --- a/admin-web-master/src/components/chakan/cd.vue +++ b/admin-web-master/src/components/chakan/cd.vue @@ -287,6 +287,7 @@ changedit } from '@/api/information' import allimg from '@/components/chakan/allimg.vue'; +  import oneht from "@/components/chakan/oneht"; import { gongyuan, parkTrails, @@ -297,7 +298,8 @@ TitleWithCircle, newmap, MapXian, - allimg + allimg, + oneht }, props: { leixing: { diff --git a/admin-web-master/src/components/chakan/map.vue b/admin-web-master/src/components/chakan/map.vue index be4ab00..be2d8c4 100644 --- a/admin-web-master/src/components/chakan/map.vue +++ b/admin-web-master/src/components/chakan/map.vue @@ -422,14 +422,14 @@ pageSize: 10, resourcesId: 'gg' + this.editbgid.id } - // cereResourceStrategylist(c1).then(res => { - // console.error(res) - // if (!Array.isArray(res.data)) { - // this.datalist = []; - // return; - // } - // this.datalist = res.data - // }) + cereResourceStrategylist(c1).then(res => { + console.error(res) + if (!Array.isArray(res.data)) { + this.datalist = []; + return; + } + this.datalist = res.data + }) selectByAdPlacementId(this.editbgid.id).then(res => { this.msg.dianji = res.data diff --git a/admin-web-master/src/components/chakan/zl.vue b/admin-web-master/src/components/chakan/zl.vue index 4605328..96713a3 100644 --- a/admin-web-master/src/components/chakan/zl.vue +++ b/admin-web-master/src/components/chakan/zl.vue @@ -218,7 +218,8 @@ -
{{getLvdaoNameByCode(info.cereBasicInformationShop.belongingGreenwaySection) || '无'}}
+
{{getLvdaoNameByCode(info.cereBasicInformationShop.belongingGreenwaySection)|| '无'}}
+ @@ -233,7 +234,7 @@ -
{{info.cereBasicInformationShop.head || '无'}}
+
{{info.cereBasicInformationShop.head || info.cereBasicInformationVenue.responsiblePerson|| '无'}}
 @@ -319,7 +320,7 @@ -
{{info.cereBasicInformationVenue.belongingParkTrail || '无'}}
+
{{info.cereBasicInformationVenue.responsiblePerson || '无'}}
 @@ -330,8 +331,13 @@ + +
{{getLvdaoNameByCode(info.cereBasicInformationVenue.belongingGreenwaySection)|| '无'}}
+ + + -
{{info.cereBasicInformationVenue.belongingParkTrail || '无'}}
+
{{info.cereBasicInformationVenue.phoneNumber || '无'}}
 @@ -368,8 +374,8 @@ - -
{{info.cereBasicInformationVenue.otherImageVideos?'查看详情':'无'}}
+ +
{{info.cereBasicInformationVenue.otherMedia?'查看详情':'无'}}
 diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js index 6570117..6e760a6 100644 --- a/admin-web-master/src/utils/request.js +++ b/admin-web-master/src/utils/request.js @@ -22,7 +22,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; - baseURL = 'http://128.10.249.31:9003'; + baseURL = 'http://128.10.249.32:9003'; } else { diff --git a/admin-web-master/src/utils/request2.js b/admin-web-master/src/utils/request2.js index 507158c..6600074 100644 --- a/admin-web-master/src/utils/request2.js +++ b/admin-web-master/src/utils/request2.js @@ -17,10 +17,10 @@ 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_1; - baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/business-server'; + // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/business-server'; // baseURL = 'http://172.16.61.125:9004'; // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/business-server'; - // baseURL = 'http://128.10.249.37:9004'; + baseURL = 'http://128.10.249.32:9004'; } else { console.error('---------------------') console.error(hostall) diff --git a/admin-web-master/src/views/comment/commentSys/index.vue b/admin-web-master/src/views/comment/commentSys/index.vue index 2e5b613..424b36f 100644 --- a/admin-web-master/src/views/comment/commentSys/index.vue +++ b/admin-web-master/src/views/comment/commentSys/index.vue @@ -56,11 +56,11 @@
查看
-
{{ scope.row.state ? "显示" : "隐藏" }}
-
删除
+
删除
-->
@@ -126,12 +126,12 @@ --> - + diff --git a/admin-web-master/src/views/online/QRCode/index.vue b/admin-web-master/src/views/online/QRCode/index.vue index e542222..c22d52f 100644 --- a/admin-web-master/src/views/online/QRCode/index.vue +++ b/admin-web-master/src/views/online/QRCode/index.vue @@ -24,7 +24,7 @@ - +