diff --git a/admin-web-master/dist.zip b/admin-web-master/dist.zip
index 232f0e7..7c4a96f 100644
--- a/admin-web-master/dist.zip
+++ b/admin-web-master/dist.zip
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index 97e23ec..2fabf35 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -17,12 +17,12 @@ let baseURL = ''
if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
// baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
- baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
+ // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
// baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
- // baseURL = 'http://128.10.249.25:9003';
+ baseURL = 'http://128.10.249.46:9003';
} else {
diff --git a/admin-web-master/src/utils/request2.js b/admin-web-master/src/utils/request2.js
index 4d617b6..6a7d760 100644
--- a/admin-web-master/src/utils/request2.js
+++ b/admin-web-master/src/utils/request2.js
@@ -20,7 +20,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost
// baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server';
// baseURL = 'http://172.16.61.125:9004';
// baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
- baseURL = 'http://128.10.249.25';
+ baseURL = 'http://128.10.249.46:9004';
} else {
console.error('---------------------')
console.error(hostall)
diff --git a/admin-web-master/src/views/customer/yixiang/index.vue b/admin-web-master/src/views/customer/yixiang/index.vue
index 97bd66f..b3192a4 100644
--- a/admin-web-master/src/views/customer/yixiang/index.vue
+++ b/admin-web-master/src/views/customer/yixiang/index.vue
@@ -28,6 +28,9 @@
+
+ {{scope.row.leaseTerm!=''?scope.row.leaseTerm:'-'}}
+
@@ -108,9 +111,11 @@
+
+
-
+
diff --git a/admin-web-master/src/views/online/transaction/index.vue b/admin-web-master/src/views/online/transaction/index.vue
index cd21fdb..a476b3f 100644
--- a/admin-web-master/src/views/online/transaction/index.vue
+++ b/admin-web-master/src/views/online/transaction/index.vue
@@ -1,35 +1,30 @@
-
-
-
交易流量监控
-
-
-
-
-
-
- 查询
-
- 重置
-
-
-
-
-
-
-
总销售额(元)
-
{{rules.totalSales}}
-
-
-
-
-
-
-
交易笔数
-
{{rules.transactions}}
-
-
-
-
-
-
交易金额(元)
-
{{rules.totalSales}}
-
-
-
-
-
-
交易成功率
-
{{rules.transactionSuccessRate}}%
-
+
-
+
+ .zhuti {
+ margin-top: 20px;
+ /* padding: 10px 20px 20px 20px; */
+ /* background-color: #Fff; */
+ min-height: calc(100vh - 50px - 20px);
+ position: relative;
+ }
+
+ /deep/ .el-form-item__content {
+ line-height: 0;
+ }
+
+ .tableBtn {
+ display: inline-block;
+ margin-right: 10px;
+ }
+
+ ::v-deep .formSearch {
+ position: relative;
+ margin: 20px 0;
+ display: flex;
+ width: 100%;
+ height: 30px;
+ font-size: 12px;
+ justify-content: space-between;
+
+ .el-form-item__label {
+ line-height: 28px;
+ font-size: 12px;
+ color: #000;
+ font-weight: 100;
+ }
+ }
+
+ .greens {
+ color: #3F9B6A;
+ }
+
+ /deep/ .el-table__row {
+ font-size: 12px;
+ }
+
+ .fenye {
+ margin-top: 20px;
+ display: flex;
+ justify-content: flex-start;
+ position: relative;
+ }
+
+ /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
+ background-color: #3F9B6A;
+ }
+
+ .el-row {
+ margin-bottom: 20px;
+ }
+
+ :last-child {
+ margin-bottom: 0;
+ }
+
+ .el-col {
+ border-radius: 4px;
+ }
+
+ .bg-purple-dark {
+ background: #99a9bf;
+ }
+
+ .bg-purple {
+ background: #d3dce6;
+ }
+
+ .bg-purple-light {
+ background: #e5e9f2;
+ }
+
+ .grid-content {
+ border-radius: 4px;
+ min-height: 36px;
+ }
+
+ .row-bg {
+ padding: 10px 0;
+ background-color: #f9fafc;
+ }
+
+ /deep/ .bg-purple[data-v-0e3fe4ec] {
+ background: #fff;
+ height: 50px;
+ }
+
+ /deep/ .el-form--label-top .el-form-item__label {
+ padding: 0;
+ }
+
+ .demo-input-suffix {
+ display: flex;
+ margin-right: 20px;
+ }
+
+ .pagination {
+ text-align: right;
+ line-height: 20px;
+ }
+
+ /deep/ .el-pagination__total {
+ margin-top: 4px;
+ }
+
+ /deep/ .btn-prev {
+ position: absolute;
+ top: 4px;
+ right: 266px;
+ }
+
+ /deep/ .el-pager {
+ position: absolute;
+ top: 4px;
+ right: 40px;
+ }
+
+ /deep/ .btn-next {
+ position: absolute;
+ top: 4px;
+ right: 10px;
+ }
+
+ ::v-deep .btn .el-button:focus,
+ .el-button:hover {
+ border: 1px solid #3F9B6A;
+ }
+
+ ::v-deep .el-select .el-input.is-focus .el-input__inner {
+ border-color: #3F9B6A
+ }
+
+ ::v-deep .dialog_css_Xq {
+ .el-dialog__header {
+ background-color: #fafafa;
+
+ }
+
+ .el-dialog__title {
+ color: #000
+ }
+ }
+
+ ::v-deep .el-tabs__item.is-active {
+ color: #3F9B6A;
+ }
+
+ ::v-deep .el-tabs__active-bar {
+ background-color: #3F9B6A;
+
+ }
+
+ .card_tree {
+ padding: 20px 20px 10px 20px;
+ margin: 0 0 20px 0;
+ background-color: #fff;
+ width: 100%;
+
+ .card_title {
+ /* color: #B0B0B0; */
+ }
+
+ .card_body {
+ font-size: 24px;
+ margin-top: 10px;
+ font-weight: 600;
+ }
+
+ .card_foot {
+ color: #B0B0B0;
+ }
+ }
+
+ .card_liuliang {
+ margin-top: 20px;
+
+ margin-right: 20px;
+ display: flex;
+
+ .card_title {
+ color: #B0B0B0;
+ font-size: 12px;
+ padding: 15px 0;
+ }
+
+ .card_body {
+ font-size: 24px;
+ font-weight: 600;
+ }
+ }
+
\ No newline at end of file
diff --git a/admin-web-master/src/views/serve/salesStatistics.vue b/admin-web-master/src/views/serve/salesStatistics.vue
index 71a0f4f..e4d3c16 100644
--- a/admin-web-master/src/views/serve/salesStatistics.vue
+++ b/admin-web-master/src/views/serve/salesStatistics.vue
@@ -113,6 +113,7 @@
mounted() {
this.getAll()
this.getShop()
+
},
methods: {
@@ -278,9 +279,16 @@
window.addEventListener('resize', () => myChart.resize());
},
charDam3(val) {
+ console.log(val)
+
let Dom = this.$refs.shop1TJ
let myChart = echarts.init(Dom)
- const productNames = val.map(item => item.saleDay)
+ val.sort((a, b) => {
+ const timeA = new Date(a.saleDay);
+ const timeB = new Date(b.saleDay);
+ return timeA - timeB;
+ })
+ let productNames =val.map(item => item.saleDay)
// const salesData = val.map(item => item.price)
let option = {
legend: {},
@@ -356,7 +364,7 @@
},
series: [{
- name: '商品销售占比',
+ name: '品牌销售占比',
type: 'pie',
radius: ['40%', '70%'],
avoidLabelOverlap: false,
@@ -389,20 +397,30 @@
this.charDam1(res.data.cereSalesReportingToHotProductVOS)
this.charDam(res.data.cereSalesReportingToProportionGoodsSoldVOS)
this.charDam5(res.data.cereSalesReportingToProportionBrandSalesVOS)
- this.charDam3(res.data.cereSalesReportingToSalesTrendVOS[0])
+ this.charDam3(res.data.cereSalesReportingToSalesTrendVOS)
+
},
getShop(){
+ let arr = []
contractGetAllnew(this.heindex).then(shopList=>{
let listType = shopList.data.content
listType.map((item,index)=>{
-
- this.$set(this.listType, index, item.cereBasicInformationShop)
+ arr.push(item.cereBasicInformationShop)
+ // this.$set(this.listType, index, item.cereBasicInformationShop)
})
- })
-
- // this.$forceUpdate()
-
-
+ const uniqueArray = arr.reduce((acc, current) => {
+
+ const existing = acc.find(item => item.shopName === current.shopName);
+
+ if (!existing) {
+ acc.push(current);
+ this.$set(this.listType, this.listType.length,current)
+ }
+
+ return acc;
+ }, []);
+
+ })
},
}
diff --git a/admin-web-master/src/views/shopbus/businessList/index.vue b/admin-web-master/src/views/shopbus/businessList/index.vue
index a5ac7c3..70301d7 100644
--- a/admin-web-master/src/views/shopbus/businessList/index.vue
+++ b/admin-web-master/src/views/shopbus/businessList/index.vue
@@ -486,7 +486,7 @@
v-else
placeholder="请选择"
>
-
+
@@ -566,12 +566,12 @@
- {{passShow?ruleForm.shopPassword:'*********'}}
+
@@ -1112,6 +1112,7 @@ export default {
this.ruleForm.cardEndTime = this.ruleForm.validityEndDate
this.ruleForm.cardPositive = this.ruleForm.cardPhotoFront
this.ruleForm.cardSide = this.ruleForm.cardPhotoBack
+ delete this.ruleForm.shopPassword
updateIndividual(this.ruleForm).then(res => {
if (res.code === '') {
this.$message({
@@ -1135,6 +1136,7 @@ export default {
this.ruleForm.cardEndTime = this.ruleForm.validityEndDate
this.ruleForm.cardPositive = this.ruleForm.cardPhotoFront
this.ruleForm.cardSide = this.ruleForm.cardPhotoBack
+ delete this.ruleForm.shopPassword
updateEnterprise(this.ruleForm).then(res => {
if (res.code === '') {
diff --git a/admin-web-master/src/views/shopbus/settlement/addSettlement.vue b/admin-web-master/src/views/shopbus/settlement/addSettlement.vue
index f1ed88e..2efcb5d 100644
--- a/admin-web-master/src/views/shopbus/settlement/addSettlement.vue
+++ b/admin-web-master/src/views/shopbus/settlement/addSettlement.vue
@@ -133,7 +133,7 @@
- {{shopDetails.certificateType}}
+ {{shopDetails.certificateType=='6'?'身份证':''}}
@@ -181,13 +181,13 @@
-
{{mimaShow?shopDetails.shopPassword:'**********'}}
-
+ -->
diff --git a/ceres-uniapp-master/config/api.js b/ceres-uniapp-master/config/api.js
index 32b49ed..8e08a21 100644
--- a/ceres-uniapp-master/config/api.js
+++ b/ceres-uniapp-master/config/api.js
@@ -1,7 +1,7 @@
-const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
-const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
-const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/'
+// const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
+// const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
+// const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/'
// const DOMAIN_PREFIXPING = 'http://128.10.249.26:9003'
// const DOMAIN_PREFIX = 'http://128.10.249.26:9007'
// const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
@@ -9,10 +9,10 @@ const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/'
// const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/'
-// const host = `${window.location.protocol}//${window.location.host}`
-// const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
-// const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api`
-// const TIAOZHUAN = `${host}/cdwlMall/`
+const host = `${window.location.protocol}//${window.location.host}`
+const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
+const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api`
+const TIAOZHUAN = `${host}/cdwlMall/`
diff --git a/ceres-uniapp-master/pages_category_page1/customer/chatBox.vue b/ceres-uniapp-master/pages_category_page1/customer/chatBox.vue
index 47cc989..ac3917d 100644
--- a/ceres-uniapp-master/pages_category_page1/customer/chatBox.vue
+++ b/ceres-uniapp-master/pages_category_page1/customer/chatBox.vue
@@ -73,7 +73,7 @@
this.timer = setInterval(() => {
this.getMsg()
- }, 2000)
+ }, 30000)
},
onLoad(option) {
diff --git a/ceres-uniapp-master/unpackage/dist/build/web.zip b/ceres-uniapp-master/unpackage/dist/build/web.zip
index b9b0b49..afcc6a3 100644
--- a/ceres-uniapp-master/unpackage/dist/build/web.zip
+++ b/ceres-uniapp-master/unpackage/dist/build/web.zip
diff --git a/ceres-uniapp-master/unpackage/dist/build/web/index.html b/ceres-uniapp-master/unpackage/dist/build/web/index.html
index e36b4b3..4328fca 100644
--- a/ceres-uniapp-master/unpackage/dist/build/web/index.html
+++ b/ceres-uniapp-master/unpackage/dist/build/web/index.html
@@ -1,2 +1,2 @@
在线商城
\ No newline at end of file
+ document.write('')