From 2310d7dfa373ee454c97105f403fb734e8f4d3de Mon Sep 17 00:00:00 2001
From: yangxin <2509699647@qq.com>
Date: Tue, 8 Apr 2025 09:45:07 +0800
Subject: [PATCH] 最新

---
 admin-web-master/src/components/Tinymce/components/EditorImage.vue    | 28 ++++++++++------------------
 admin-web-master/src/components/add/addss.vue                         | 23 ++++++++++++++++++++---
 admin-web-master/src/utils/request.js                                 |  4 ++--
 ceres-uniapp-master/config/api.js                                     | 12 ++++++------
 ceres-uniapp-master/pages_category_page1/goodsModule/evaluate.vue     |  4 ++--
 ceres-uniapp-master/pages_category_page1/goodsModule/evaluateList.vue |  2 +-
 ceres-uniapp-master/pages_category_page1/procedure/procedure.vue      |  2 +-
 lvdao-miniapp/main.js                                                 |  8 ++++----
 lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue                         |  2 +-
 lvdao-miniapp/utils/request.js                                        |  4 ++--
 merchant-web-master/src/utils/request.js                              |  2 +-
 settled-merchant-master/src/api/index.js                              | 25 ++++++++++++-------------
 12 files changed, 62 insertions(+), 54 deletions(-)

diff --git a/admin-web-master/src/components/Tinymce/components/EditorImage.vue b/admin-web-master/src/components/Tinymce/components/EditorImage.vue
index 5603ee4..854d1cf 100644
--- a/admin-web-master/src/components/Tinymce/components/EditorImage.vue
+++ b/admin-web-master/src/components/Tinymce/components/EditorImage.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="upload-container">
     <el-button :style="{background:color,borderColor:color}" icon="el-icon-upload" size="mini" type="primary" @click=" dialogVisible=true">
-      上传图片
+      上传
     </el-button>
     <el-dialog :visible.sync="dialogVisible">
       <el-upload
@@ -11,17 +11,15 @@
         :on-remove="handleRemove"
         :on-success="handleSuccess"
         :before-upload="beforeUpload"
-   class="editor-slide-upload upload-container"
-        :action="action"
+        class="editor-slide-upload"
+        action="https://httpbin.org/post"
         list-type="picture-card"
-         accept="image/jpeg,image/png,image/gif"
       >
         <el-button size="small" type="primary">
           点击上传
         </el-button>
       </el-upload>
-      <el-button @click="dialogVisible = false"  class="buttonHover"
-            style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">
+      <el-button @click="dialogVisible = false">
         取消
       </el-button>
       <el-button type="primary" @click="handleSubmit">
@@ -32,7 +30,7 @@
 </template>
 
 <script>
-import { upUrl } from '@/utils/request'
+// import { getToken } from 'api/qiniu'
 
 export default {
   name: 'EditorSlideUpload',
@@ -46,8 +44,7 @@ export default {
     return {
       dialogVisible: false,
       listObj: {},
-      fileList: [],
-      action:upUrl
+      fileList: []
     }
   },
   methods: {
@@ -70,7 +67,7 @@ export default {
       const objKeyArr = Object.keys(this.listObj)
       for (let i = 0, len = objKeyArr.length; i < len; i++) {
         if (this.listObj[objKeyArr[i]].uid === uid) {
-          this.listObj[objKeyArr[i]].url = this.$baseURL+response.data
+          this.listObj[objKeyArr[i]].url = response.files.file
           this.listObj[objKeyArr[i]].hasSuccess = true
           return
         }
@@ -107,13 +104,8 @@ export default {
 <style lang="scss" scoped>
 .editor-slide-upload {
   margin-bottom: 20px;
-  // ::v-deep .el-upload--picture-card {
-  //   width: 100%;
-  // }
-}
-.upload-container {
-  // display: flex;
-  // justify-content: center; /* 水平居中 */
-  // align-items: center; /* 垂直居中 */
+  ::v-deep .el-upload--picture-card {
+    width: 100%;
+  }
 }
 </style>
diff --git a/admin-web-master/src/components/add/addss.vue b/admin-web-master/src/components/add/addss.vue
index 96a3964..bacec89 100644
--- a/admin-web-master/src/components/add/addss.vue
+++ b/admin-web-master/src/components/add/addss.vue
@@ -12,7 +12,7 @@
 
 
       <el-form-item label="手机号" prop="phone">
-        <el-input v-model="formInline.phone" placeholder="请输入"></el-input>
+        <el-input v-model="formInline.phone" maxlength="11" placeholder="请输入"></el-input>
       </el-form-item>
 
       <el-form-item label="性别" prop="sex">
@@ -240,15 +240,32 @@
 				  ...this.formInline,
 				  checkState: '2',
 				  state:'1',
+				  flag:false,
 				  applyTime: this.updateCurrentTime()
 				}).then(res => {
-				  if (res.code == 200) {
+				  if (res.code == 200 && res.message !='手机号已被注册') {
 				    this.$message({
 				      message: '添加成功',
 				      type: 'success'
 				    })
 				    this.$emit('removeonaction', '1')
-				  } else {
+				  } else if(res.code == 200 && res.message =='手机号已被注册'){
+					  cerePlatformMerchantadd({
+					    ...this.formInline,
+					    checkState: '2',
+					    state:'1',
+						flag:false,
+					    applyTime: this.updateCurrentTime()
+					  }).then(res => {
+						  if (res.code == 200) {
+						    this.$message({
+						      message: '添加成功',
+						      type: 'success'
+						    })
+						    this.$emit('removeonaction', '1')
+						  }
+					  })
+				  }else {
 				    this.$message({
 				      message: res.msg,
 				      type: 'error'
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index 6e760a6..45fa0ae 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.32:9003';
+  // baseURL = 'http://192.168.2.227:9003';
 
 
 } else {
diff --git a/ceres-uniapp-master/config/api.js b/ceres-uniapp-master/config/api.js
index 960c1a5..23b6138 100644
--- a/ceres-uniapp-master/config/api.js
+++ b/ceres-uniapp-master/config/api.js
@@ -2,10 +2,10 @@
 // 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.32:9003' 
-const DOMAIN_PREFIX = 'http://128.10.249.32:9007'
-// const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
-// const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
+// const DOMAIN_PREFIXPING = 'http://128.10.249.32:9003' 
+// const DOMAIN_PREFIX = 'http://128.10.249.32:9007'
+const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
+const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
 const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/'
 
 
@@ -45,9 +45,9 @@ const TERMINAL = 1
 
 module.exports = {
 	terminal: TERMINAL, // 画布设备 1 小程序，2 H5，3 App 4 电脑
-	SettledMerchantPrefix: TIAOZHUAN + 'settled-merchant' ,
+	// SettledMerchantPrefix: TIAOZHUAN + 'settled-merchant' ,
 	// 'https://jy.scjysm.asia:18086/cdwlMall/settled-merchant', //商家入驻链接
-	
+	SettledMerchantPrefix:'http://localhost:8082',
 	shareLink: TIAOZHUAN + 'meh5', // 分享地址
 	// shareLink: 'http://172.16.61.123:9007/h5', // 分享地址
 	
diff --git a/ceres-uniapp-master/pages_category_page1/goodsModule/evaluate.vue b/ceres-uniapp-master/pages_category_page1/goodsModule/evaluate.vue
index 537894b..21d40e3 100644
--- a/ceres-uniapp-master/pages_category_page1/goodsModule/evaluate.vue
+++ b/ceres-uniapp-master/pages_category_page1/goodsModule/evaluate.vue
@@ -136,7 +136,7 @@
 				}
 				// console.log(this.commentImgs,'fffffffffffffffff')
 				// return
-				let data = [{
+				let data ={
 					orderId:this.orderId,
 					skuId:this.commentData.skuId,
 					productId:this.commentData.productId,
@@ -146,7 +146,7 @@
 					des:this.descStar,
 					delivery:this.logisticsStar,
 					attitude:this.serviceStar
-				}]
+				}
 				
 				NET.request(API.Comment, {
 					params:data
diff --git a/ceres-uniapp-master/pages_category_page1/goodsModule/evaluateList.vue b/ceres-uniapp-master/pages_category_page1/goodsModule/evaluateList.vue
index 99b8217..374ef76 100644
--- a/ceres-uniapp-master/pages_category_page1/goodsModule/evaluateList.vue
+++ b/ceres-uniapp-master/pages_category_page1/goodsModule/evaluateList.vue
@@ -12,7 +12,7 @@
 			<view class="evaluate-contentbox mar-top-20" v-for="(item,index) in commentList" :key="index">
 				<view class="evaluate-content flex-items flex-row flex-sp-between">
 					<view class="flex-items">
-						<image class="user-headSmallImg" :src="item.headImage"></image>
+						<image class="user-headSmallImg" :src="$baseURL+item.headImage"></image>
             <view class="">
               <text class="fs28 mar-left-20">{{item.name}}</text>
               <view class="mar-left-20 fs22 font-color-999 mar-top-10">
diff --git a/ceres-uniapp-master/pages_category_page1/procedure/procedure.vue b/ceres-uniapp-master/pages_category_page1/procedure/procedure.vue
index b6420cc..b4230b2 100644
--- a/ceres-uniapp-master/pages_category_page1/procedure/procedure.vue
+++ b/ceres-uniapp-master/pages_category_page1/procedure/procedure.vue
@@ -9,7 +9,7 @@
 				 <view class="time">
 				 	{{tableList.releaseTime}}
 				 </view>
-				 <view class="desc">
+				 <view class="desc" style="white-space: normal; word-wrap: break-word;">
 				 	<u-parse :html="tableList.announcementContent"></u-parse>
 				
 				 </view>
diff --git a/lvdao-miniapp/main.js b/lvdao-miniapp/main.js
index 04a1ae4..05955c5 100644
--- a/lvdao-miniapp/main.js
+++ b/lvdao-miniapp/main.js
@@ -8,13 +8,13 @@ import uView from "uview-ui";
 import DialogBox from './components/DialogBox/DialogBox';
 //  let hostall = window.location.href;
 // let c1 = hostall.split('cdwlMall')[0];
-let c1 = 'https://jy.scjysm.asia:18086/'
-// let c1 = 'https://zhgw-uat.028wlkj.com/'
+// let c1 = 'https://jy.scjysm.asia:18086/'
+let c1 = 'https://zhgw-uat.028wlkj.com/'
 Vue.config.productionTip = false
 Vue.prototype.$http = http
 Vue.prototype.$imgUrl = (url) => {
-  return (c1 + "cdwlMall/questionnaire/file/static" + url);
-  // return (c1 + "cdwlMall/zsfwzxt/test/file/static" + url);
+  // return (c1 + "cdwlMall/questionnaire/file/static" + url);
+  return (c1 + "cdwlMall/zsfwzxt/test/file/static" + url);
 }
 Vue.prototype.$img = c1+ 'cdwlMall'
 // Vue.prototype.$upload = "https://zhld.028wlkj.com:49008/cdwlMall/admin-server/miniio/upload"
diff --git a/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue b/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue
index 5361b94..6e5bd5a 100644
--- a/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue
+++ b/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue
@@ -224,7 +224,7 @@
 		},
 		onLoad(options) {
 			this.imgurl = this.$img
-			const item = JSON.parse(decodeURIComponent(options.item));
+			const item = JSON.parse(decodeURIComponent(options.item))
 			console.log(options.item, '1123123213')
 			this.record = item
 			let imgsList = item.cereBasicInformationShop && item.cereBasicInformationShop.displayMainImage ? item
diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js
index e1f63d5..0d2a740 100644
--- a/lvdao-miniapp/utils/request.js
+++ b/lvdao-miniapp/utils/request.js
@@ -1,8 +1,8 @@
 
 //  let hostall = window.location.href;
 // let c1 = hostall.split('cdwlMall')[0];
-let c1 = 'https://jy.scjysm.asia:18086/'
-// let c1 = 'https://zhgw-uat.028wlkj.com/'
+// let c1 = 'https://jy.scjysm.asia:18086/'
+let c1 = 'https://zhgw-uat.028wlkj.com/'
 //封装request请求
 const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 	//判断header提交数据类型
diff --git a/merchant-web-master/src/utils/request.js b/merchant-web-master/src/utils/request.js
index 4bb872c..561d83f 100644
--- a/merchant-web-master/src/utils/request.js
+++ b/merchant-web-master/src/utils/request.js
@@ -21,7 +21,7 @@ let PREFIX;
   // PREFIX = 'http://8.130.38.56:8027/business-server';
   PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/business-server';
   // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
-  // PREFIX = 'http://128.10.249.31:9004';
+  // PREFIX = 'http://128.10.249.32:9004';
 }else{
   // PREFIX = '/merchant-business';
   // PREFIX = 'http://8.130.38.56:9004';
diff --git a/settled-merchant-master/src/api/index.js b/settled-merchant-master/src/api/index.js
index 383803f..3caf5c6 100644
--- a/settled-merchant-master/src/api/index.js
+++ b/settled-merchant-master/src/api/index.js
@@ -3,19 +3,18 @@ import home from './home'
 const host = `${window.location.protocol}//${window.location.host}`
 const TIAOZHUAN = `${host}/cdwlMall/meserver/`
 // 获取当前环境变量 true => 生产环境 false => 开发环境
-const BASEURL = (process.env.NODE_ENV === 'production') ? TIAOZHUAN + 'api' : TIAOZHUAN + 'api'
-// const upUrl = (process.env.NODE_ENV === 'production') ? `${window.location.protocol}//${window.location.host}/cdwlMall/meserver/admin-server` : 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
-const upUrl = (process.env.NODE_ENV === 'production') ? TIAOZHUAN + 'admin-server' : TIAOZHUAN + 'admin-server'
+const BASEURL = (process.env.NODE_ENV === 'production') ? TIAOZHUAN + 'api' : 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
+const upUrl = (process.env.NODE_ENV === 'production') ? TIAOZHUAN + 'admin-server' : 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
 export const api = {
-  // 登录模块
-  ...home(BASEURL),
-  // 图片上传
-  upload: `${upUrl}/miniio/uploadQuestion`,
-  // 商家入驻
-  enterpriseCheck: `${BASEURL}/check/enterpriseCheck`,
-  individualCheck: `${BASEURL}/check/individualCheck`,
-  organizationsCheck: `${BASEURL}/check/organizationsCheck`,
-  personalCheck: `${BASEURL}/check/personalCheck`,
-  getByName: `${BASEURL}/app/getSelect`
+	// 登录模块
+	...home(BASEURL),
+	// 图片上传
+	upload: `${upUrl}/miniio/uploadQuestion`,
+	// 商家入驻
+	enterpriseCheck: `${BASEURL}/check/enterpriseCheck`,
+	individualCheck: `${BASEURL}/check/individualCheck`,
+	organizationsCheck: `${BASEURL}/check/organizationsCheck`,
+	personalCheck: `${BASEURL}/check/personalCheck`,
+	getByName: `${BASEURL}/app/getSelect`
 }
 export default api
--
libgit2 0.21.4