diff --git a/admin-web-master/src/components/Tinymce/components/EditorImage.vue b/admin-web-master/src/components/Tinymce/components/EditorImage.vue
index 854d1cf..7c2d6ac 100644
--- a/admin-web-master/src/components/Tinymce/components/EditorImage.vue
+++ b/admin-web-master/src/components/Tinymce/components/EditorImage.vue
@@ -12,7 +12,7 @@
         :on-success="handleSuccess"
         :before-upload="beforeUpload"
         class="editor-slide-upload"
-        action="https://httpbin.org/post"
+        :action="action"
         list-type="picture-card"
       >
         <el-button size="small" type="primary">
@@ -30,7 +30,7 @@
 </template>
 
 <script>
-// import { getToken } from 'api/qiniu'
+import { upUrl } from '@/utils/request'
 
 export default {
   name: 'EditorSlideUpload',
@@ -44,7 +44,8 @@ export default {
     return {
       dialogVisible: false,
       listObj: {},
-      fileList: []
+      fileList: [],
+      action:upUrl
     }
   },
   methods: {
@@ -67,7 +68,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 = response.files.file
+          this.listObj[objKeyArr[i]].url = this.$baseURL+response.files.file
           this.listObj[objKeyArr[i]].hasSuccess = true
           return
         }
diff --git a/admin-web-master/src/main.js b/admin-web-master/src/main.js
index ea452ea..442eb46 100644
--- a/admin-web-master/src/main.js
+++ b/admin-web-master/src/main.js
@@ -38,7 +38,7 @@ Vue.prototype.$hostUrl =`${window.location.protocol}//${window.location.host}/cd
 
 
 let host = window.location.host;
-if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528' ) {
+if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
   Vue.prototype.$baseURL ='https://jy.scjysm.asia:18086/cdwlMall'
   Vue.prototype.$fontBold = `https://jy.scjysm.asia:18086/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Bold.ttf`
   Vue.prototype.$fontRegular = `https://jy.scjysm.asia:18086/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Regular.ttf`
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index c4ca789..c0af5a3 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -17,9 +17,15 @@ 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 = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
+  // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
   // baseURL = 'http://172.16.61.125:9003';
+
+  // baseURL = 'http://192.168.2.107:9003';
+
+  baseURL = 'http://192.168.2.138:9003';
+
   // baseURL = 'http://10.0.0.51:9003';
+
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
   // baseURL = 'http://192.168.2.225:9003';
 
@@ -43,6 +49,7 @@ const service = axios.create({
 })
 // export const upurl = baseURL
 export const uploadUrl = `${baseURL}/miniio/upload`
+export const upUrl = `${baseURL}/miniio/uploadQuestion`
 export const token = getToken()
 
 // request interceptor
diff --git a/admin-web-master/src/views/comment/commentSys/index.vue b/admin-web-master/src/views/comment/commentSys/index.vue
index a189139..a511beb 100644
--- a/admin-web-master/src/views/comment/commentSys/index.vue
+++ b/admin-web-master/src/views/comment/commentSys/index.vue
@@ -102,7 +102,7 @@
               <el-image
                 v-for="(item,index) in commentDetails.images"
                 :key="index"
-                :src="item"
+                :src="$baseURL+item"
                 :preview-src-list="commentDetails.images"
               />
             </div>
diff --git a/admin-web-master/src/views/member/memberList/details.vue b/admin-web-master/src/views/member/memberList/details.vue
index e2b0138..6f58dde 100644
--- a/admin-web-master/src/views/member/memberList/details.vue
+++ b/admin-web-master/src/views/member/memberList/details.vue
@@ -1,7 +1,11 @@
 <template>
-  <el-dialog title="详情" width="70%" :visible.sync="visible" :close-on-click-modal="false" @close="closeModalDetail">
+  <div style="">
+    <div style="height:58px;line-height:58px;background-color: #fff;padding: 0 10px;">
+        <div style="color:#0006"> <span>会员管理</span>   <span style="padding:0 5px;">></span>  <span style="color:#000000e6">会员详情</span></div>
+      </div>
     <div class="custom_info_page">
-      <h2>客户信息</h2>
+      
+      <TitleWithCircle title="客户信息" style="margin-bottom: 15px;"/>
       <div class="custom_info">
         <div class="info_item">
           <img :src="userObj.headImage" alt>
@@ -18,14 +22,14 @@
         </div>
       </div>
       <div class="custom_tag">
-        <h2>客户标签</h2>
+        <TitleWithCircle title="客户标签" style="margin-bottom: 15px;"/>
         <div class="Tag">
           <p v-for="(item, index) in tagList" :key="index">{{ item.tagName }}</p>
           <p @click="addTag">贴标签</p>
         </div>
       </div>
       <div class="custom_data">
-        <h2>消费数据</h2>
+        <TitleWithCircle title="消费数据" style="margin-bottom: 15px;"/>
         <div class="data_list">
           <p>
             <span>
@@ -102,9 +106,7 @@
       <div v-if="componentName === 'addressInfo'">
         <el-table
           :data="userObj.receives"
-          border
-          :header-cell-style="{ background: '#EEF3FF', color: '#333333' }"
-          style="width: 100%"
+          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
         >
           <el-table-column prop="receiveName" label="姓名" />
           <el-table-column prop="receivePhone" label="电话" />
@@ -204,19 +206,32 @@
             style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="delCom">删除</el-button>
         </span>
       </el-dialog>
-    </div>
-    <div slot="footer" class="dialog-footer">
+      <div style="margin-top: 10px;">
       <el-button class="buttonHover"
             style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="doCancel">取消</el-button>
-      <el-button style="background-color: #3F9B6A;color: #fff" @click="doSubmit">确认</el-button>
+      <!-- <el-button style="background-color: #3F9B6A;color: #fff" @click="doSubmit">确认</el-button> -->
     </div>
-  </el-dialog>
+    </div>
+   
+  </div>
 </template>
 
 <script>
 import { customerMageGetById, getLabels, customerSaveUserLabel } from '@/api/customerMage'
 import { commentSysGetById, commentSysUpdate, commentSysDelete, commentAllow } from '@/api/comment'
+import TitleWithCircle from '@/components/top/index';
 export default {
+  components: {
+      TitleWithCircle
+    },
+    props: {  
+    // 声明接收的数据  
+    message: {  
+      type: Object, // 指定数据的类型  
+      required: true, // 指定该数据是必需的  
+      default: {}// 指定默认值  
+    }
+  },
   data () {
     return {
       visible: false,
@@ -253,11 +268,9 @@ export default {
       comState: 1 // 是否隐藏 1-是 0-否
     }
   },
-  // created () {
-  //   this.user = this.$route.params
-  //   console.log(this.user)
-  //   this.getUser(this.user)
-  // },
+  mounted () {
+    this.getUser(this.message)
+  },
   methods: {
     // 允许展示
     async toShow () {
@@ -378,6 +391,7 @@ export default {
     },
     doCancel () {
       this.visible = false
+      this.$emit('childMessage', this.visible); 
     },
     doSubmit () {
       this.visible = false
@@ -462,8 +476,7 @@ h2 {
   }
 }
 .custom_info_page {
-  margin-top: 20px;
-  padding: 20px 100px;
+  padding: 20px 40px;
   background-color: #fff;
   min-height: 500px;
 
diff --git a/admin-web-master/src/views/member/memberList/index.vue b/admin-web-master/src/views/member/memberList/index.vue
index 44a50b8..ddcbd8f 100644
--- a/admin-web-master/src/views/member/memberList/index.vue
+++ b/admin-web-master/src/views/member/memberList/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="background-color:#f7f7f7;padding:10px 10px;">
-    <div class="zhuti">
+    <div class="zhuti" v-if="visible==false">
       <div style="height:58px;line-height:58px;">
         <div style="color:#0006"> <span>会员管理</span>   <span style="padding:0 5px;">></span>  <span style="color:#000000e6">会员管理</span></div>
       </div>
@@ -23,7 +23,6 @@
                 <el-option
                   v-for="(item, index) in tipsList"
                   :key="index"
-
                   :label="item.labelName"
                   :value="item.buyerLabelId"
                 />
@@ -79,7 +78,7 @@
             :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
             >
               <el-table-column prop="name" label="客户昵称" />
-              <el-table-column prop="phone" label="手机号" />
+              <el-table-column prop="phone" label="手机号" show-overflow-tooltip/>
               <el-table-column prop="memberLevelName" label="会员等级" />
               <el-table-column prop="total" label="消费总额" />
               <el-table-column prop="buyers" label="购买次数" />
@@ -135,7 +134,7 @@
             <el-button @click="searchTips">查询</el-button>
           </el-form-item>
           <el-form-item>
-            <el-button type="text" @click="runTips">管理标签</el-button>
+            <el-button style="background-color: #3F9B6A;color: #fff" @click="runTips" >管理标签</el-button>
           </el-form-item>
         </el-form>
         <!-- 多选 -->
@@ -183,7 +182,7 @@
         <el-button style="background-color: #3F9B6A;color: #fff" @click="saveIntegral">确定</el-button>
       </span>
     </el-dialog>
-    <member-details ref="memberDetails" @reset="reset" />
+    <member-details ref="memberDetails" @reset="reset" @childMessage="childMessage"  :message="parentMessage"  v-if="visible"/>
   </div>
 </template>
 
@@ -233,6 +232,10 @@ export default {
       buyerUserId: '', // 用户id
       credit: '', // 积分值 扣减积分则传负数
       updateWay: true, // 修改积分单选绑定
+      visible:false,
+      parentMessage:{
+
+      }
     }
   },
   created () {
@@ -418,7 +421,12 @@ export default {
       //   name: 'customerDetails',
       //   params: { buyerUserId: row.buyerUserId, orderFormid: row.orderFormid }
       // })
-      this.$refs.memberDetails.getUser({ buyerUserId: row.buyerUserId, orderFormid: row.orderFormid })
+    
+    this.parentMessage ={
+      buyerUserId: row.buyerUserId, 
+      orderFormid: row.orderFormid
+    }
+    this.visible = true
     },
     // 初始化查询所有数据
     async getAll (formParams) {
@@ -433,6 +441,9 @@ export default {
     },
     reset () {
       this.getAll(this.formParams)
+    },
+    childMessage(msg){
+      this.visible = msg
     }
   }
 }
diff --git a/admin-web-master/src/views/notice/history.vue b/admin-web-master/src/views/notice/history.vue
index 4998a13..9562b25 100644
--- a/admin-web-master/src/views/notice/history.vue
+++ b/admin-web-master/src/views/notice/history.vue
@@ -202,8 +202,14 @@ export default {
       })
     },
     // 重置表单
-    async clear(formName) {
-      this.$refs[formName].resetFields()
+     clear(formName) {
+      this.formParams= {
+        noticeTitle: null,
+        noticeType: null,
+        dates: [],
+        page: 1,
+        pageSize: 10
+      }
       this.getAll()
     },
     // 更改页数
diff --git a/admin-web-master/src/views/order/after/details/index.vue b/admin-web-master/src/views/order/after/details/index.vue
index 672cc6a..c72e1ab 100644
--- a/admin-web-master/src/views/order/after/details/index.vue
+++ b/admin-web-master/src/views/order/after/details/index.vue
@@ -8,14 +8,15 @@
             style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">拒绝售后</el-button>
           <el-button style="background-color: #3F9B6A;color: #fff" @click="handle">同意售后</el-button>
         </div>
-        <div v-else class="btn_list">
+        <div class="btn_list" style="margin-right: 10px;">
           <el-button @click="back" class="buttonHover"
             style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
         </div>
       </div>
       <div class="detail">
         <div class="order_info">
-          <p class="detail_title">订单信息</p>
+          <!-- <p class="detail_title">订单信息</p> -->
+          <TitleWithCircle title="订单信息" style="margin-bottom: 15px;"/>
           <ul class="order_list">
             <li v-for="(item,index) in orderInfo" :key="index">
               <p>{{ item.name }}:</p>
@@ -29,12 +30,13 @@
         </div>
 
         <div class="after_sale_shop">
-          <p class="detail_title">售后商品</p>
+          <!-- <p class="detail_title">售后商品</p> -->
+          <TitleWithCircle title="售后商品" style="margin-bottom: 15px;"/>
           <div v-for="(item,index) in shopList" :key="index" class="goods_list">
             <div class="good_details">
               <ul>
                 <li>
-                  <img :src="item.image">
+                  <img :src="$baseURL+item.image">
                 </li>
                 <li>
                   <p>{{ item.productName }}</p>
@@ -61,7 +63,8 @@
       </div>
 
       <div class="after_sales_record">
-        <p class="detail_title">协商历史</p>
+        <!-- <p class="detail_title">协商历史</p> -->
+        <TitleWithCircle title="协商历史" style="margin-bottom: 15px;"/>
         <div v-for="(item,index) in recordList" :key="index" class="record_list">
           <div class="record_list_title">
             <p>{{ item.title }}</p>
@@ -115,13 +118,15 @@ import orderInfo from './component/order-info'
 import storeInfo from './component/store-info'
 import { afterGetById, getDilevery, getBuyer, handles } from '@/api/after'
 import { businessListGetById } from '@/api/business'
+import TitleWithCircle from '@/components/top/index';
 export default {
   components: {
     afterSale,
     buyer,
     logistics,
     orderInfo,
-    storeInfo
+    storeInfo,
+    TitleWithCircle
   },
   props: {
     detailRow: {
@@ -350,7 +355,7 @@ export default {
     .after_sales_record {
       min-height: 500px;
       background: rgba(255, 255, 255, 1);
-      box-shadow: 0px 0px 10px 0px rgba(51, 51, 51, 0.15);
+      // box-shadow: 0px 0px 10px 0px rgba(51, 51, 51, 0.15);
       border-radius: 4px;
       padding: 1px 30px;
       margin-top: 15px;
diff --git a/admin-web-master/src/views/order/after/index.vue b/admin-web-master/src/views/order/after/index.vue
index 16eb34e..ea85c43 100644
--- a/admin-web-master/src/views/order/after/index.vue
+++ b/admin-web-master/src/views/order/after/index.vue
@@ -1,7 +1,8 @@
 <!--  -->
 <template>
-  <div style="background-color:#f7f7f7;padding:10px 10px;">
-    <div class="refundPage">
+  <div style="background-color:#f7f7f7;padding:10px 10px;" >
+     <div v-if="detailVisible==false">
+      <div class="refundPage">
       <div style="height:58px;line-height:58px;">
         <div style="color:#0006"> <span>订单管理</span>   <span style="padding:0 5px;">></span>  <span style="color:#000000e6">售后处理</span></div>
       </div>
@@ -78,8 +79,8 @@
           />
         </div>
       </div>
-
-      <el-dialog
+   
+      <!-- <el-dialog
         title="订单详情"
         :visible.sync="detailVisible"
         width="75%"
@@ -88,9 +89,20 @@
         :close-on-click-modal="false"
         :modal-append-to-body="false"
       >
-        <OrderDetail class="detailDialog" :detail-row="form" @cancel="cancel" />
-      </el-dialog>
+      
+      </el-dialog> -->
     </div>
+     </div>
+     
+     <div class="refundPage">
+      <div style="height:58px;line-height:58px;" v-if="detailVisible">
+        <div style="color:#0006"> <span>订单管理</span>   <span style="padding:0 5px;">></span>  <span style="color:#000000e6">订单详情</span></div>
+        <div>
+          <OrderDetail class="detailDialog" :detail-row="form" @cancel="cancel" />
+        </div>
+      </div>
+     </div>
+  
   </div>
 </template>
 
diff --git a/admin-web-master/src/views/order/ordersel/pendDetails.vue b/admin-web-master/src/views/order/ordersel/pendDetails.vue
index e8c88eb..ac1e7f6 100644
--- a/admin-web-master/src/views/order/ordersel/pendDetails.vue
+++ b/admin-web-master/src/views/order/ordersel/pendDetails.vue
@@ -3,7 +3,7 @@
     <div class="cotent">
       <div class="left_part">
         <div class="order_info">
-          <h2>订单信息</h2>
+          <TitleWithCircle title="订单信息" style="margin-bottom: 15px;"/>
           <ul>
             <li>
               <p>
@@ -60,7 +60,7 @@
           </ul>
         </div>
         <div class="goods_info">
-          <h2>商品信息</h2>
+          <TitleWithCircle title="商品信息" style="margin-bottom: 15px;"/>
           <div
             v-for="(item, index) in order.products"
             :key="index"
@@ -80,7 +80,7 @@
             <div class="good_details">
               <ul>
                 <li>
-                  <img :src="item.image">
+                  <img :src="$baseURL+item.image">
                   <div class="details">
                     <p>{{ item.productName }}</p>
                     <p class="skuDetails">
@@ -139,7 +139,7 @@
       </div>
       <div class="right_part">
         <div class="pay_order_info">
-          <h2>下单人信息</h2>
+          <TitleWithCircle title="下单人信息" style="margin-bottom: 15px;"/>
           <p>下单账户: {{ order.customerName }}</p>
           <p>订单总数: {{ order.total }}个</p>
           <p>下单备注: {{ order.remark }}</p>
@@ -197,7 +197,11 @@
 
 <script>
 import { orderGetById, orderGetSelect, orderDilevery } from '@/api/order'
+import TitleWithCircle from '@/components/top/index';
 export default {
+  components: {
+      TitleWithCircle
+    },
   props: {
     detailRow: {
       type: Object,
diff --git a/admin-web-master/src/views/order/pending/pendDetails.vue b/admin-web-master/src/views/order/pending/pendDetails.vue
index e2e8c1e..c51a552 100644
--- a/admin-web-master/src/views/order/pending/pendDetails.vue
+++ b/admin-web-master/src/views/order/pending/pendDetails.vue
@@ -3,7 +3,8 @@
     <div class="cotent">
       <div class="left_part">
         <div class="order_info">
-          <h2>订单信息</h2>
+          <!-- <h2>订单信息</h2> -->
+          <TitleWithCircle title="订单信息" style="margin-bottom: 15px;"/>
           <ul>
             <li>
               <p>
@@ -60,7 +61,7 @@
           </ul>
         </div>
         <div class="goods_info">
-          <h2>商品信息</h2>
+          <TitleWithCircle title="商品信息" style="margin-bottom: 15px;"/>
           <div
             v-for="(item, index) in order.products"
             :key="index"
@@ -80,7 +81,7 @@
             <div class="good_details">
               <ul>
                 <li>
-                  <img :src="item.image">
+                  <img :src="$baseURL+item.image">
                   <div class="details">
                     <p>{{ item.productName }}</p>
                     <p class="skuDetails">
@@ -139,7 +140,7 @@
       </div>
       <div class="right_part">
         <div class="pay_order_info">
-          <h2>下单人信息</h2>
+          <TitleWithCircle title="下单人信息" style="margin-bottom: 15px;"/>
           <p>下单账户: {{ order.customerName }}</p>
           <p>订单总数: {{ order.total }}个</p>
           <p>下单备注: {{ order.remark }}</p>
@@ -198,7 +199,11 @@
 
 <script>
 import { orderGetById, orderGetSelect, orderDilevery } from '@/api/order'
+import TitleWithCircle from '@/components/top/index';
 export default {
+  components: {
+      TitleWithCircle
+    },
   props: {
     detailRow: {
       type: Object,
diff --git a/admin-web-master/src/views/renovation/commdityClass/Edit.vue b/admin-web-master/src/views/renovation/commdityClass/Edit.vue
index 409c845..d788b50 100644
--- a/admin-web-master/src/views/renovation/commdityClass/Edit.vue
+++ b/admin-web-master/src/views/renovation/commdityClass/Edit.vue
@@ -142,7 +142,7 @@
   </el-dialog>
 </template>
 <script>
-import { uploadUrl } from '@/utils/request'
+import { upUrl } from '@/utils/request'
 import {
   getSelect,
   commdityClassAdd,
@@ -205,9 +205,10 @@ export default {
       headers: {
         Authorization: ''
       },
-      action: uploadUrl,
+      action: upUrl,
       dataObj: {
-        folderId: 1
+        folderId: 1,
+       
       },
       deleteArr: []
     }
diff --git a/admin-web-master/src/views/renovation/commoditySystem/index.vue b/admin-web-master/src/views/renovation/commoditySystem/index.vue
index fc12260..188986d 100644
--- a/admin-web-master/src/views/renovation/commoditySystem/index.vue
+++ b/admin-web-master/src/views/renovation/commoditySystem/index.vue
@@ -109,14 +109,14 @@
             label="上架状态"
             show-overflow-tooltip
           >
-            <template slot-scope="scope">
+            <template slot-scope="scope" >
               <span v-if="scope.row.shelveState == 0">已下架</span>
               <span v-if="scope.row.shelveState == 1">已上架</span>
               <span v-if="scope.row.shelveState == 2">待审核</span>
               <span v-if="scope.row.shelveState == 3">审核失败</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="200">
+          <el-table-column label="操作" width="220" fixed="right">
             <template slot-scope="scope">
               <div class="btnList">
                 <div
diff --git a/admin-web-master/src/views/stockControl/inventory/index.vue b/admin-web-master/src/views/stockControl/inventory/index.vue
index 9dceba8..5870d7e 100644
--- a/admin-web-master/src/views/stockControl/inventory/index.vue
+++ b/admin-web-master/src/views/stockControl/inventory/index.vue
@@ -74,7 +74,7 @@
           />
           <el-table-column label="商品主图" width="150" align="center">
             <template slot-scope="scope">
-              <img height="80" width="80" :src="scope.row.image" alt srcset>
+              <img height="80" width="80" :src="$baseURL+scope.row.image" alt srcset>
             </template>
           </el-table-column>
           <el-table-column prop="productName" label="商品名称" width="180" />
@@ -117,7 +117,7 @@
               <span v-if="scope.row.shelveState == 3">审核失败</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="200">
+          <el-table-column label="操作" width="220" fixed="right">
             <template slot-scope="scope">
               <div v-if="scope.row.shelveState == 1" @click="OutForced(scope.row)" class="tableBtn greens">强制下架</div>
               <div v-if="scope.row.shelveState == 1" @click="setFictitious(scope.row)" class="tableBtn greens">虚拟销量</div>
diff --git a/admin-web-master/src/views/stockControl/stocksForewarn/index.vue b/admin-web-master/src/views/stockControl/stocksForewarn/index.vue
index 6122b90..9c03535 100644
--- a/admin-web-master/src/views/stockControl/stocksForewarn/index.vue
+++ b/admin-web-master/src/views/stockControl/stocksForewarn/index.vue
@@ -5,31 +5,31 @@
       <div style="height:58px;line-height:58px;">
         <div style="color:#0006"> <span>库存管理</span>   <span style="padding:0 5px;">></span>  <span style="color:#000000e6">库存预警</span></div>
       </div>
-      <div style="margin-bottom:20px;"><el-button  plain @click="setthreshold" size="mini" style="background-color: #3F9B6A;color: #fff;">库存阈值设置</el-button></div>
+      <div style="margin-bottom:20px;"><el-button  plain @click="setthreshold"  style="background-color: #3F9B6A;color: #fff;">库存阈值设置</el-button></div>
       <!-- 搜索 -->
        <div class="filter-container">
          <div style="display:flex;justify-content: space-between;background-color: #f5f5f5;padding:10px">
           <div style="line-height:200%">筛选查询</div>
           <div>
             <button @click="toggleFilter">收起筛选</button>
-            <el-button  plain @click="search" size="mini" style="background-color: #3F9B6A;color: #fff;">查询</el-button>
-            <el-button plain @click="resetting" size="mini" style="color: #000;border-color:#d5d5d5;">重置</el-button>
+            <el-button  plain @click="search"  style="background-color: #3F9B6A;color: #fff;">查询</el-button>
+            <el-button plain @click="clear"  style="color: #000;border-color:#d5d5d5;">重置</el-button>
           </div>
          </div>
          <div :class="fut?'formSearch':'collapsed'" ref="formSearch">
-            <el-form :inline="true" :model="formSel" label-width="auto">
+            <el-form :inline="true" :model="formInline" label-width="auto">
               <el-form-item label="商品名称">
-                <el-input v-model="formSel.shopname" placeholder="请输入方案编号" size="mini" style="width: 178px;margin-right: 5px;"/>
-              </el-form-item>
-              <el-form-item label="入库人">
-                <el-input v-model="formSel.rkr" placeholder="请输入方案编号" size="mini" style="width: 178px;margin-right: 5px;"/>
-              </el-form-item>
-              <el-form-item label="上架时间">
-                <el-input v-model="formSel.stime" placeholder="请输入方案编号" size="mini" style="width: 178px;margin-right: 5px;"/>
-              </el-form-item>
-              <el-form-item label="入库时间">
-                <el-input v-model="formSel.rtime" placeholder="请输入方案编号" size="mini" style="width: 178px;margin-right: 5px;"/>
+                <el-input v-model="formInline.productName" placeholder="请输入商品名称"  style="width: 178px;margin-right: 5px;"/>
               </el-form-item>
+              <!-- <el-form-item label="入库人">
+                <el-input v-model="formSel.rkr" placeholder="请输入方案编号"  style="width: 178px;margin-right: 5px;"/>
+              </el-form-item> -->
+              <!-- <el-form-item label="上架时间">
+                <el-input v-model="formInline.stime" placeholder="请输入方案编号"  style="width: 178px;margin-right: 5px;"/>
+              </el-form-item> -->
+              <!-- <el-form-item label="入库时间">
+                <el-input v-model="formSel.rtime" placeholder="请输入方案编号"  style="width: 178px;margin-right: 5px;"/>
+              </el-form-item> -->
               </el-form>
               </div>
         </div>
@@ -42,7 +42,6 @@
           ref="multipleTable"
           v-loading="loading"
           :data="tableData"
-          border
           tooltip-effect="dark"
            @selection-change="handleSelectionChange"
         :header-cell-style="{fontSize: '12px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
@@ -57,7 +56,7 @@
           />
           <el-table-column label="商品主图" width="150" align="center">
             <template slot-scope="scope">
-              <img height="80" width="80" :src="scope.row.image" alt srcset>
+              <img height="80" width="80" :src="$baseURL+scope.row.image" alt srcset>
             </template>
           </el-table-column>
           <el-table-column prop="productName" label="商品名称" min-width="10%" />
@@ -117,19 +116,19 @@
         <div class="formyuzhi">
           <el-form :inline="true" :model="kucunNum" label-width="auto" label-position="left">
             <el-form-item label="最小库存阈值">
-              <el-input v-model="kucunNum.minNum" placeholder="请输入" size="mini" style="width: 100%;"/>
+              <el-input v-model="kucunNum.minNum" placeholder="请输入"  style="width: 100%;"/>
             </el-form-item>
             <el-form-item label="最大库存阈值">
-              <el-input v-model="kucunNum.maxNum" placeholder="请输入" size="mini" style="width: 100%;"/>
+              <el-input v-model="kucunNum.maxNum" placeholder="请输入"  style="width: 100%;"/>
             </el-form-item>
             <el-form-item label="安全库存量">
-              <el-input v-model="kucunNum.anNum" placeholder="请输入" size="mini" style="width: 100%;"/>
+              <el-input v-model="kucunNum.anNum" placeholder="请输入"  style="width: 100%;"/>
             </el-form-item>
             </el-form>
         </div>
         <span slot="footer" class="dialog-footer">
-          <el-button plain @click="handleClose" size="mini" style="color: #000;border-color:#d5d5d5;">取消</el-button>
-      <el-button  plain @click="kucunSet" size="mini" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+          <el-button plain @click="handleClose"  style="color: #000;border-color:#d5d5d5;">取消</el-button>
+      <el-button  plain @click="kucunSet"  style="background-color: #3F9B6A;color: #fff;">确定</el-button>
 
         </span>
       </el-dialog>
@@ -202,7 +201,9 @@ export default {
     },
     //  查询
     search () {
-
+      this.total = 1;
+      this.formInline.page = 1;
+      this.getAll(this.formInline);
     },
    async kucunSet(){
      const yuzhi={
@@ -227,8 +228,21 @@ export default {
     },
      handleClose() {
 this.dialogVisible = false
-      }
-
+      },
+ // 重置
+ clear () {
+      this.formInline = {
+        searchType: '1',
+        search: '', // 搜索字段
+        state: '',
+        // afterState: '', // 售后状态 0-无售后 1-售后中 2-售后成功 3-售后关闭
+        dates: [], // 下单时间数组
+        page: 1,
+        shopName: '',
+        pageSize: 10
+      };
+      this.getAll(this.formInline);
+    },
   }
 }
 </script>
diff --git a/ceres-uniapp-master - 副本/components/canvasShow/basics/product/app/index.vue b/ceres-uniapp-master - 副本/components/canvasShow/basics/product/app/index.vue
index 546948f..323a0b6 100644
--- a/ceres-uniapp-master - 副本/components/canvasShow/basics/product/app/index.vue
+++ b/ceres-uniapp-master - 副本/components/canvasShow/basics/product/app/index.vue
@@ -39,7 +39,8 @@
 				<view class="scroll-list" style="flex-direction: row;">
 					<view class="scroll-list__goods-item" v-for="(item, index) in list" :key="index"
 						:class="[(index === 9) && 'scroll-list__goods-item--no-margin-right']" @click="goodsDateils(item.shopId,item.productId,item.skuId)">
-						<image class="scroll-list__goods-item__image" :src="item.image"></image>
+						
+						<image class="scroll-list__goods-item__image" :src="$baseURL+item.image"></image>
 						<view class="scroll-list__goods-item__title">{{item.productName}}</view>
 						<view class="" style="display: flex;justify-content: space-between;">
 							<text class="scroll-list__goods-item__text" style="color: #C44A51;">￥{{ item.price }}</text>
@@ -78,15 +79,15 @@
 				<swiper-item class="product-list-item-warp" v-for="(item,index) in productData" :key="index">
 					<div class="product-list-item" v-if="JSON.stringify(item)!=='{}'" @click="jumpProductDetail(item)">
 						<div class="product-list-img">
-							<img class="img pic-img default-img" :src="item.image">
+							<img class="img pic-img default-img" :src="$baseURL+item.image">
 						</div>
 						<div class="product-list-info">
-							<label class="product-name">{{ item.productName }}</label>
+							<label class="product-name">{{ item.productName}}</label>
 							<div class="flex">
 								<div class="shop-box" v-if="typeId == 1" @click.stop="jumpStore(item)">
 									<label class="shop-name">{{ item.shopName }}</label>
 									<div class="shop-logo">
-										<img :src="item.shopLogo">
+										<img :src="$baseURL+item.shopLogo">
 									</div>
 								</div>
 								<label class="buy-count">已售{{ item.number ? item.number : 0 }}件</label>
@@ -158,7 +159,7 @@
 				<div class="product-list-item-warp" v-for="(item,index) in productData" :key="index">
 					<div @click="jumpProductDetail(item)" class="product-list-item" v-if="JSON.stringify(item)!=='{}'">
 						<div class="product-list-img">
-							<img class="img pic-img default-img" :src="item.image">
+							<img class="img pic-img default-img" :src="$baseURL+item.image">
 						</div>
 						<div class="product-list-info">
 							<label class="product-name">{{ item.productName }}</label>
@@ -166,7 +167,7 @@
 								<div class="shop-box" v-if="typeId == 1" @click.stop="jumpStore(item)">
 									<label class="shop-name">{{ item.shopName }}</label>
 									<div class="shop-logo">
-										<img :src="item.shopLogo">
+										<img :src="$baseURL+item.shopLogo">
 									</div>
 								</div>
 								<label class="buy-count">已售{{ item.number ? item.number : 0 }}件</label>
diff --git a/ceres-uniapp-master/components/basics/categoryShow.vue b/ceres-uniapp-master/components/basics/categoryShow.vue
index 6d6b9a8..b4c385d 100644
--- a/ceres-uniapp-master/components/basics/categoryShow.vue
+++ b/ceres-uniapp-master/components/basics/categoryShow.vue
@@ -14,7 +14,7 @@
                 <view class="shop-box" @click.stop="jumpStore(item)">
                   <view class="shop-name" @click="jumpProductDetail(item)">{{item.shopName}}</view>
                   <view class="shop-logo">
-                    <img :src="item.shopLogo">
+                    <img :src="$baseURL+item.shopLogo">
                   </view>
                 </view>
                 <view class="buy-count">{{item.users?item.users: 0}}人付款</view>
diff --git a/ceres-uniapp-master/components/canvasShow/basics/product/app/index.vue b/ceres-uniapp-master/components/canvasShow/basics/product/app/index.vue
index 206e3e2..ea4a2df 100644
--- a/ceres-uniapp-master/components/canvasShow/basics/product/app/index.vue
+++ b/ceres-uniapp-master/components/canvasShow/basics/product/app/index.vue
@@ -39,7 +39,7 @@
 				<view class="scroll-list" style="flex-direction: row;">
 					<view class="scroll-list__goods-item" v-for="(item, index) in list" :key="index"
 						:class="[(index === 9) && 'scroll-list__goods-item--no-margin-right']" @click="goodsDateils(item.shopId,item.productId,item.skuId)">
-						<image class="scroll-list__goods-item__image" :src="item.image"></image>
+						<image class="scroll-list__goods-item__image" :src="$baseURL+item.image"></image>
 						<view class="scroll-list__goods-item__title">{{item.productName}}</view>
 						<view class="" style="display: flex;justify-content: space-between;">
 							<text class="scroll-list__goods-item__text" style="color: #C44A51;">￥{{ item.price }}</text>
@@ -78,7 +78,7 @@
 				<swiper-item class="product-list-item-warp" v-for="(item,index) in productData" :key="index">
 					<div class="product-list-item" v-if="JSON.stringify(item)!=='{}'" @click="jumpProductDetail(item)">
 						<div class="product-list-img">
-							<img class="img pic-img default-img" :src="item.image">
+							<img class="img pic-img default-img" :src="$baseURL+item.image">
 						</div>
 						<div class="product-list-info">
 							<label class="product-name">{{ item.productName }}</label>
@@ -86,7 +86,7 @@
 								<div class="shop-box" v-if="typeId == 1" @click.stop="jumpStore(item)">
 									<label class="shop-name">{{ item.shopName }}</label>
 									<div class="shop-logo">
-										<img :src="item.shopLogo">
+										<img :src="$baseURL+item.shopLogo">
 									</div>
 								</div>
 								<label class="buy-count">已售{{ item.number ? item.number : 0 }}件</label>
@@ -158,7 +158,7 @@
 				<div class="product-list-item-warp" v-for="(item,index) in productData" :key="index">
 					<div @click="jumpProductDetail(item)" class="product-list-item" v-if="JSON.stringify(item)!=='{}'">
 						<div class="product-list-img">
-							<img class="img pic-img default-img" :src="item.image">
+							<img class="img pic-img default-img" :src="$baseURL+item.image">
 						</div>
 						<div class="product-list-info">
 							<label class="product-name">{{ item.productName }}</label>
@@ -166,7 +166,7 @@
 								<div class="shop-box" v-if="typeId == 1" @click.stop="jumpStore(item)">
 									<label class="shop-name">{{ item.shopName }}</label>
 									<div class="shop-logo">
-										<img :src="item.shopLogo">
+										<img :src="$baseURL+item.shopLogo">
 									</div>
 								</div>
 								<label class="buy-count">已售{{ item.number ? item.number : 0 }}件</label>
@@ -315,7 +315,8 @@
 			margin-right: 20rpx;
 
 			&__image {
-				width: 220rpx;
+				margin-left: 10%;
+				width: 80%;
 				height: 220rpx;
 				border-radius: 10rpx;
 			}
diff --git a/ceres-uniapp-master/components/canvasShow/canvasShowPage.vue b/ceres-uniapp-master/components/canvasShow/canvasShowPage.vue
index 5eaa415..2d2c51d 100644
--- a/ceres-uniapp-master/components/canvasShow/canvasShowPage.vue
+++ b/ceres-uniapp-master/components/canvasShow/canvasShowPage.vue
@@ -122,10 +122,10 @@
 
 import comBanner from '@/components/canvasShow/basics/banner.vue'
 import comText from '@/components/canvasShow/basics/text.vue'
-import comImageText from '@/components/canvasShow/basics/imageText'
-import comBrandList from '@/components/canvasShow/basics/brandList'
-import comCategoryList from '@/components/canvasShow/basics/categoryList'
-import comImageTextList from '@/components/canvasShow/basics/imageTextList'
+import comImageText from '@/components/canvasShow/basics/imageText.vue'
+import comBrandList from '@/components/canvasShow/basics/brandList.vue'
+import comCategoryList from '@/components/canvasShow/basics/categoryList.vue'
+import comImageTextList from '@/components/canvasShow/basics/imageTextList.vue'
 import comAssistDiv from '@/components/canvasShow/basics/assistDiv'
 import comImageTextNav from '@/components/canvasShow/basics/imageTextNav'
 import comProduct from '@/components/canvasShow/basics/product/app/index'
diff --git a/ceres-uniapp-master/components/hoteRecommed/index.vue b/ceres-uniapp-master/components/hoteRecommed/index.vue
index ee0424d..6d06554 100644
--- a/ceres-uniapp-master/components/hoteRecommed/index.vue
+++ b/ceres-uniapp-master/components/hoteRecommed/index.vue
@@ -11,7 +11,7 @@
         @click="goodsDateils(item.shopId,item.productId,item.skuId)"
       >
         <view class="itemImg">
-          <image :src="item.image" class="pic-img default-img"></image>
+          <image :src="$baseURL+item.image" class="pic-img default-img"></image>
         </view>
         <view class="itemTit">{{item.productName}}</view>
         <view class="flex-items shopNameBox">
diff --git a/ceres-uniapp-master/config/api.js b/ceres-uniapp-master/config/api.js
index 1b1adda..69e9914 100644
--- a/ceres-uniapp-master/config/api.js
+++ b/ceres-uniapp-master/config/api.js
@@ -1,14 +1,14 @@
 
-const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
-const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
-// const DOMAIN_PREFIXPING = 'http://10.0.0.51:9003' 
-// const DOMAIN_PREFIX = 'http://10.0.0.51:9007'
+// const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
+// const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
+const DOMAIN_PREFIXPING = 'http://192.168.2.138:9003' 
+const DOMAIN_PREFIX = 'http://192.168.2.138:9007'
 // const host = `${window.location.protocol}//${window.location.host}`
 // const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
 // const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` 
 // const DOMAIN_PREFIXPING = `http://8.130.38.56:9003`
 // const DOMAIN_PREFIX = 'http://8.130.38.56:9007'
-
+	
 
 
 // const DOMAIN_PREFIXPING = 'http://8.130.38.56:9007'
@@ -39,13 +39,14 @@ const TERMINAL = 1
 
 module.exports = {
 	terminal: TERMINAL, // 画布设备 1 小程序，2 H5，3 App 4 电脑
-	SettledMerchantPrefix: 'https://jy.scjysm.asia:18086/settled-merchant', //商家入驻链接
+	SettledMerchantPrefix: 'https://jy.scjysm.asia:18086/cdwlMall/meserver/settled-merchant', //商家入驻链接
 	shareLink: DOMAIN_PREFIX + '/h5', // 分享地址
 	// shareLink: 'http://172.16.61.123:9007/h5', // 分享地址
 	
 
 	//登录注册
-	Verify: WX_API_BASE + '/app/getCode', //  获取短信验证码
+	// Verify: WX_API_BASE + '/app/getCode', //  获取短信验证码
+	verification:WX_API_BASE + '/app/verification', //  获取短信验证码
 	Login: WX_API_BASE + '/app/login', //  手机号验证码登录、注册
 	WxLogin: WX_API_BASE + '/app/wxLogin', //  微信登录
 	AlipayLogin: WX_API_BASE + '/app/alipayLogin', //  支付宝登录
@@ -318,4 +319,7 @@ module.exports = {
 	cereCouponKeyUse: WX_API_BASE + '/order/cereCouponKeyUse',
 	//问卷解析token
 	jietoken: WX_API_BASE  + '/cereQuestionnaireAnswering/get/token', 
+	 // 上传图片
+		UpUrl: WX_API_BASEPING + '/miniio/uploadQuestion',
+		
 }
diff --git a/ceres-uniapp-master/pages/tabbar/cart/index.vue b/ceres-uniapp-master/pages/tabbar/cart/index.vue
index 5154bed..312250c 100644
--- a/ceres-uniapp-master/pages/tabbar/cart/index.vue
+++ b/ceres-uniapp-master/pages/tabbar/cart/index.vue
@@ -116,7 +116,7 @@
                   ></image>
                   <view class="pro-r">
                     <image
-                        :src="skuItem.image"
+                        :src="$baseURL+skuItem.image"
                         class="pro-img default-img  u-skeleton-fillet"
                     ></image>
                     <view class="pro-r-r  u-skeleton-fillet">
diff --git a/ceres-uniapp-master/pages/tabbar/index/index.vue b/ceres-uniapp-master/pages/tabbar/index/index.vue
index 7717e7f..3bc9662 100644
--- a/ceres-uniapp-master/pages/tabbar/index/index.vue
+++ b/ceres-uniapp-master/pages/tabbar/index/index.vue
@@ -176,7 +176,6 @@ export default {
       // })
       NET.request(apiUrl, {}, 'GET').then(res => {
         if (JSON.stringify(res.data) !== '{}') {
-			console.log(res.data.json)
           var componentsData = JSON.parse(res.data.json)
           this.componentsData = componentsData
         }
diff --git a/ceres-uniapp-master/pages_category_page1/coupon/product.vue b/ceres-uniapp-master/pages_category_page1/coupon/product.vue
index d67e5dd..0895dc5 100644
--- a/ceres-uniapp-master/pages_category_page1/coupon/product.vue
+++ b/ceres-uniapp-master/pages_category_page1/coupon/product.vue
@@ -16,7 +16,7 @@
             @click="goodsDateils(item.shopId,item.productId,item.skuId)"
           >
             <view class="productImg">
-              <image :src="item.image"></image>
+              <image :src="$baseURL+item.image"></image>
             </view>
             <view class="productTit fs28 font-color-333">{{item.productName}}</view>
             <view class="productPrice font-color-C83732 fs40">￥{{item.price}}</view>
diff --git a/ceres-uniapp-master/pages_category_page1/distributionModule/index.vue b/ceres-uniapp-master/pages_category_page1/distributionModule/index.vue
index 1138e6a..8cd3b29 100644
--- a/ceres-uniapp-master/pages_category_page1/distributionModule/index.vue
+++ b/ceres-uniapp-master/pages_category_page1/distributionModule/index.vue
@@ -19,7 +19,7 @@
           <view class="flex-items-plus">
             <image
                 class="storeLogoImg"
-                :src="item.shopLogo"
+                :src="$baseURL+item.shopLogo"
             ></image>
             <view class="font-color-656 fs24 mar-left-20">
               <label class="fs30 font-color-333">{{ item.shopName }}</label>
diff --git a/ceres-uniapp-master/pages_category_page1/distributionModule/salesIndex.vue b/ceres-uniapp-master/pages_category_page1/distributionModule/salesIndex.vue
index 8dcd94e..70c873d 100644
--- a/ceres-uniapp-master/pages_category_page1/distributionModule/salesIndex.vue
+++ b/ceres-uniapp-master/pages_category_page1/distributionModule/salesIndex.vue
@@ -5,7 +5,7 @@
     <view class="salesIndex-topBackImg">
 			<view class="topStoreTag flex-row-plus">
 				<view class="storeName overflow font-color-FFF">
-          <image class="storeLogoImg" :src="item.shopLogo"></image>
+          <image class="storeLogoImg" :src="$baseURL+item.shopLogo"></image>
 					<label class=" fs24">{{item.shopName}}</label>
 				</view>
 			</view>
diff --git a/ceres-uniapp-master/pages_category_page1/goodsModule/addEvaluate.vue b/ceres-uniapp-master/pages_category_page1/goodsModule/addEvaluate.vue
index a9366a5..8549774 100644
--- a/ceres-uniapp-master/pages_category_page1/goodsModule/addEvaluate.vue
+++ b/ceres-uniapp-master/pages_category_page1/goodsModule/addEvaluate.vue
@@ -6,7 +6,7 @@
 		<view class="addEvaluate-box flex-items-plus flex-column-plus">
 			<view class="addEvaluate flex-column-plus">
 				<view class="addEvaluateTitle-box flex-row-plus mar-top-20 mar-left-20">
-					<image class="title-img" :src="productImage"></image>
+					<image class="title-img" :src="$baseURL+productImage"></image>
 					<view class="title-textbox overflow">
 						<label class="fs28 title-text">{{orderProductVO.productName}}</label>
 						<view v-if="orderProductVO.value" class="fs24 mar-top-10 sukValue">
diff --git a/ceres-uniapp-master/pages_category_page1/goodsModule/components/GoodActivityDetail.vue b/ceres-uniapp-master/pages_category_page1/goodsModule/components/GoodActivityDetail.vue
index 97d8f11..3e70d62 100644
--- a/ceres-uniapp-master/pages_category_page1/goodsModule/components/GoodActivityDetail.vue
+++ b/ceres-uniapp-master/pages_category_page1/goodsModule/components/GoodActivityDetail.vue
@@ -19,7 +19,7 @@
       >
         <image
             class="goodsImg default-img u-skeleton-fillet"
-            :src="imgItem"
+            :src="$baseURL+imgItem"
         ></image>
       </swiper-item>
     </swiper>
diff --git a/ceres-uniapp-master/pages_category_page1/goodsModule/components/GoodSkuSelect.vue b/ceres-uniapp-master/pages_category_page1/goodsModule/components/GoodSkuSelect.vue
index 1716349..7e5cb1d 100644
--- a/ceres-uniapp-master/pages_category_page1/goodsModule/components/GoodSkuSelect.vue
+++ b/ceres-uniapp-master/pages_category_page1/goodsModule/components/GoodSkuSelect.vue
@@ -16,7 +16,7 @@
         <view class="detailImg-box flex-row-plus">
           <image
               class="detailImg"
-              :src="selectedSku.image"
+              :src="$baseURL+selectedSku.image"
           ></image>
           <view class="flex-column-plus mar-left-40">
             <view class="" style="color: #f4281e;">
diff --git a/ceres-uniapp-master/pages_category_page1/goodsModule/evaluate.vue b/ceres-uniapp-master/pages_category_page1/goodsModule/evaluate.vue
index 09c041e..9790cc6 100644
--- a/ceres-uniapp-master/pages_category_page1/goodsModule/evaluate.vue
+++ b/ceres-uniapp-master/pages_category_page1/goodsModule/evaluate.vue
@@ -6,11 +6,11 @@
 		<view class="addEvaluate-box flex-items-plus flex-column-plus">
 			<view class="addEvaluate flex-column-plus">
 				<view class="addEvaluateTitle-box flex-row-plus mar-top-20 mar-left-20">
-					<image class="title-img" :src="commentData.image"></image>
+					<image class="title-img" :src="$baseURL+commentData.image"></image>
 					<view class="title-textbox overflow">
 						<label class="fs24 title-text">{{commentData.productName}}</label>
 						<view class="font-color-999 fs22 mar-top-10">
-							{{commentData.value}}
+							规格：{{commentData.value}}
 						</view>
 					</view>
 				</view>
@@ -77,7 +77,7 @@
 				logisticsStar:5,
 				serviceStar:5,
 				fileList:[],
-				action:API.UploadUrl,
+				action:API.UpUrl,
 				formData:{'folderId': -1},
 				commentText:'',
 				commentImgsFlag:false,
diff --git a/ceres-uniapp-master/pages_category_page1/goodsModule/goodsDetails.vue b/ceres-uniapp-master/pages_category_page1/goodsModule/goodsDetails.vue
index a42a3d6..4f9ed24 100644
--- a/ceres-uniapp-master/pages_category_page1/goodsModule/goodsDetails.vue
+++ b/ceres-uniapp-master/pages_category_page1/goodsModule/goodsDetails.vue
@@ -183,7 +183,7 @@
             <image
                 @click="handleJumpToStore"
                 class="inStore-logo default-img"
-                :src="productData.shopLogo"
+                :src="$baseURL+productData.shopLogo"
             ></image>
           </view>
           <view class="flex-display flex-column mar-left-20">
diff --git a/ceres-uniapp-master/pages_category_page1/goodsModule/goodsList.vue b/ceres-uniapp-master/pages_category_page1/goodsModule/goodsList.vue
index dbb23ee..d6b1dc4 100644
--- a/ceres-uniapp-master/pages_category_page1/goodsModule/goodsList.vue
+++ b/ceres-uniapp-master/pages_category_page1/goodsModule/goodsList.vue
@@ -95,7 +95,7 @@
           <view class="listItem">
             <view class="itemBox">
               <img
-                  :src="item.image"
+                  :src="$baseURL+item.image"
                   class="pic-img u-skeleton-fillet default-img"
               >
             </view>
diff --git a/ceres-uniapp-master/pages_category_page1/goodsModule/userEvaluate.vue b/ceres-uniapp-master/pages_category_page1/goodsModule/userEvaluate.vue
index e543459..4ea7483 100644
--- a/ceres-uniapp-master/pages_category_page1/goodsModule/userEvaluate.vue
+++ b/ceres-uniapp-master/pages_category_page1/goodsModule/userEvaluate.vue
@@ -60,7 +60,7 @@
             </view>
             <view class="goodsDes-box u-skeleton-fillet flex-column-plus mar-top-30">
               <view class="flex-row-plus" @click.stop="goGoodsDetails(item.shopId,item.productId,item.skuId)">
-                <image class="goodsDes-img default-img" :src="item.productImage"></image>
+                <image class="goodsDes-img default-img" :src="$baseURL+item.productImage"></image>
                 <view class="goodsDesText-box">
                   <label class="fs26 goodsDes-text">{{item.productName}}</label>
                   <view class="mar-top-70">
diff --git a/ceres-uniapp-master/pages_category_page1/orderModule/afterSaleApply.vue b/ceres-uniapp-master/pages_category_page1/orderModule/afterSaleApply.vue
index 60ce0b4..9e5306f 100644
--- a/ceres-uniapp-master/pages_category_page1/orderModule/afterSaleApply.vue
+++ b/ceres-uniapp-master/pages_category_page1/orderModule/afterSaleApply.vue
@@ -19,7 +19,7 @@
                     :name='item.skuId'
                     @change="checkboxChange(item)">
                   <view class="order-info-item">
-                    <image :src="item.image"
+                    <image :src="$baseURL+item.image"
                            class="product-img"></image>
                     <view class="info-box">
                       <text class="product-name">{{ item.productName }}</text>
diff --git a/ceres-uniapp-master/pages_category_page1/orderModule/afterSaleApplyRefund.vue b/ceres-uniapp-master/pages_category_page1/orderModule/afterSaleApplyRefund.vue
index a354dc0..7366859 100644
--- a/ceres-uniapp-master/pages_category_page1/orderModule/afterSaleApplyRefund.vue
+++ b/ceres-uniapp-master/pages_category_page1/orderModule/afterSaleApplyRefund.vue
@@ -338,7 +338,7 @@ export default {
         returnImgs: "",
         returnReason: 0
       },
-      action: API.UploadUrl,
+      action: API.UpUrl,
       formData: {'folderId': -1},
       headerToken: {Authorization: ''},
       fileList: [],
diff --git a/ceres-uniapp-master/pages_category_page1/orderModule/index.vue b/ceres-uniapp-master/pages_category_page1/orderModule/index.vue
index 21d82f3..30afba1 100644
--- a/ceres-uniapp-master/pages_category_page1/orderModule/index.vue
+++ b/ceres-uniapp-master/pages_category_page1/orderModule/index.vue
@@ -36,7 +36,7 @@
                 @click.stop="goShop(orderItem.shopId)"
             >
               <image
-                  :src="orderItem.shopLogo"
+                  :src="$baseURL+orderItem.shopLogo"
                   class="shop-img"
               />
               <text class="shop-name">{{ orderItem.shopName }}</text>
@@ -60,12 +60,12 @@
                   :key="skuIndex"
               >
                 <image
-                    :src="skuItem.image"
+                    :src="$baseURL+skuItem.image"
                     class="product-img default-img"
                 />
                 <view class="info-box">
                   <text class="product-name">{{ skuItem.productName }}</text>
-                  <view class="product-sku">{{ skuItem.value }}</view>
+                  <view class="product-sku">规格：{{ skuItem.value }}</view>
                   <view class="price-sku-box">
                     <view class="box-h flex-items-plus">
                       <text class="product-price">
@@ -95,7 +95,7 @@
               <view class="total-price-box">
                 总价¥{{
                   (orderItem.orderPrice + orderItem.logisticsPrice).toFixed(2)
-                }},优惠¥{{ Number(orderItem.discountPrice)/100 }}
+                }},优惠¥{{orderItem.discountPrice}}
                 <span v-if="orderItem.price > 0">
                       ，{{ orderItem.state === 1 ? '应付¥' : '实付¥' }}{{ orderItem.price }}
                     </span>
diff --git a/ceres-uniapp-master/pages_category_page1/orderModule/orderConfirm.vue b/ceres-uniapp-master/pages_category_page1/orderModule/orderConfirm.vue
index bd65baa..300092f 100644
--- a/ceres-uniapp-master/pages_category_page1/orderModule/orderConfirm.vue
+++ b/ceres-uniapp-master/pages_category_page1/orderModule/orderConfirm.vue
@@ -39,7 +39,7 @@
 							<view class="order-info">
 								<view class="order-info-item" v-for="(cItem, index) in item.skus"
 									:key="cItem.productId">
-									<image :src="cItem.image" class="product-img"></image>
+									<image :src="$baseURL+cItem.image" class="product-img"></image>
 									<view class="info-box">
 										<text class="product-name">{{ cItem.productName }}</text>
 										<view class="product-sku">
@@ -1435,7 +1435,8 @@
 					title: '结算中...',
 				})
 				try {
-					console.log('结算中结算中结算中结算中结算中结算中', data)
+						console.log('结算中结算中结算中结算中结算中结算中', data)
+					// return
 					const res = await NET.request(API.PlaceOrder, data, 'POST')
 					// 下单成功处理埋点
 					this.$store.dispatch('doPointer', {
@@ -1468,6 +1469,7 @@
 					if (this.payObj.paymentMode && this.payObj.huabeiPeriod) {
 						submitResult.huabeiPeriod = this.payObj.huabeiPeriod
 					}
+					// return
 					await handleDoPay.call(this, submitResult)
 
 				} catch (e) {
diff --git a/ceres-uniapp-master/pages_category_page1/orderModule/orderDetails.vue b/ceres-uniapp-master/pages_category_page1/orderModule/orderDetails.vue
index bf9de84..4056a45 100644
--- a/ceres-uniapp-master/pages_category_page1/orderModule/orderDetails.vue
+++ b/ceres-uniapp-master/pages_category_page1/orderModule/orderDetails.vue
@@ -113,13 +113,13 @@
 								<view class="order-info">
 									<view class="order-info-item" v-for="proItem in dataList.skus"
 										:key="proItem.productId" @click="goodsItemTap(proItem.productId,proItem.skuId)">
-										<image :src="proItem.image" class="product-img default-img"></image>
+										<image :src="$baseURL+proItem.image" class="product-img default-img"></image>
 										<view class="info-box">
 											<text class="product-name">{{ proItem.productName }}</text>
 											<view class="price-sku-box">
 												<view class="product-sku">
 													<view class="mar-left-20" v-for="vItem in proItem.values">
-														<text>{{ vItem }}</text>
+														<text>规格：{{ vItem }}</text>
 													</view>
 												</view>
 												<view class="product-num">x {{ proItem.number }}</view>
diff --git a/ceres-uniapp-master/pages_category_page1/store/index.vue b/ceres-uniapp-master/pages_category_page1/store/index.vue
index 5f85a97..a83e152 100644
--- a/ceres-uniapp-master/pages_category_page1/store/index.vue
+++ b/ceres-uniapp-master/pages_category_page1/store/index.vue
@@ -15,7 +15,7 @@
 			<view class="stopInfo">
 				<view class="shop-top-content">
 					<view class="contentLeft">
-						<image :src="storeInfo.shopLogo" class="photo-img"></image>
+						<image :src="$baseURL+storeInfo.shopLogo" class="photo-img"></image>
 						<view class="shop-info-top">
 							<view class="shop-name">
 								<text class="shop-name">{{storeInfo.shopName}}</text>
@@ -87,6 +87,7 @@
 				</view>
 				<view v-else>
 					<view class="shop-banner-box" v-if="bannerInfo && bannerInfo.length > 0">
+					
 						<swiper indicator-dots="true">
 							<swiper-item v-for="(item, index) in bannerInfo" :key="index" @click="applyForRecruit()">
 								<image :src="item.bannerImage" class="shop-banner-img"></image>
@@ -133,7 +134,7 @@
 							<view class="shop-list-box" v-if="total > 0">
 								<view class="item" v-for="(cItem, index) in storeInfolist" :key="index"
 									@click="goodsItemTap(cItem.productId,cItem.skuId)">
-									<image :src="cItem.image" class="product-img default-img"></image>
+									<image :src="$baseURL+cItem.image" class="product-img default-img"></image>
 									<view class="product-bottom-box">
 										<view class="product-name">{{cItem.productName}}</view>
 										<view class="product-num font-color-C5AA7B mar-top-10">已售{{cItem.number}}件
diff --git a/ceres-uniapp-master/pages_category_page2/channelCoupon/index.vue b/ceres-uniapp-master/pages_category_page2/channelCoupon/index.vue
index 9f1b306..881caf2 100644
--- a/ceres-uniapp-master/pages_category_page2/channelCoupon/index.vue
+++ b/ceres-uniapp-master/pages_category_page2/channelCoupon/index.vue
@@ -53,7 +53,7 @@
                   <div class="shop-box" @click.stop="jumpStore(item)">
                     <label class="shop-name">{{item.shopName}}</label>
                     <div class="shop-logo">
-                      <img :src="item.shopLogo">
+                      <img :src="$baseURL+item.shopLogo">
                     </div>
                   </div>
                   <label class="buy-count">{{item.users?item.users: 0}}人付款</label>
diff --git a/ceres-uniapp-master/pages_category_page2/orderModule/afterSale.vue b/ceres-uniapp-master/pages_category_page2/orderModule/afterSale.vue
index 6cb5011..0b526c8 100644
--- a/ceres-uniapp-master/pages_category_page2/orderModule/afterSale.vue
+++ b/ceres-uniapp-master/pages_category_page2/orderModule/afterSale.vue
@@ -8,7 +8,7 @@
 					<view class="item" v-for="item in FindReturnDatalist">
 						<view class="order-list-top">
 							<view class="top-l" @click="goShop(item.shopId)">
-								<image :src="item.shopLogo" class="shop-img"></image>
+								<image :src="$baseURL+item.shopLogo" class="shop-img"></image>
 								<text class="shop-name">{{item.shopName}}</text>
 								<image src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/arrowRight.png" class="arrow-img"></image>
 							</view>
diff --git a/ceres-uniapp-master/pages_category_page2/userModule/accountLogin.vue b/ceres-uniapp-master/pages_category_page2/userModule/accountLogin.vue
index 5bfbe7c..655262d 100644
--- a/ceres-uniapp-master/pages_category_page2/userModule/accountLogin.vue
+++ b/ceres-uniapp-master/pages_category_page2/userModule/accountLogin.vue
@@ -1,379 +1,415 @@
 <template>
-  <!-- 登录 -->
-  <view class="container flex-items-plus flex-column">
-    <global-loading />
-    <view class="login-logoBox">
-   <!--   <image
+	<!-- 登录 -->
+	<view class="container flex-items-plus flex-column">
+		<global-loading />
+		<view class="login-logoBox">
+			<!--   <image
           class="login-logo"
           src="@/static/logo.png"
       ></image> -->
-	  <text style="color:#3f9b6a;font-weight:bold;font-size:30px;">锦江公园</text>
-    </view>
-    <view class="iphoneNum-box flex-row-plus flex-items">
-      <view style="margin-right: 30rpx">
-        <image
-            class="loginIcon"
-            src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/phone.png"
-        ></image>
-      </view>
-      <view>
-        <input
-            v-model="loginQuery.account"
-            placeholder-class="iphoneNum-input"
-            type="number"
-            maxlength='11'
-            placeholder="请输入您的手机号"
-        />
-      </view>
-    </view>
-    <view class="flex-row-plus mar-top-20">
-      <view class="code-box">
-        <view style="margin-right: 30rpx">
-          <image
-              class="loginIcon"
-              src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/code.png"
-          ></image>
-        </view>
-        <view>
-          <input
-              v-model="loginQuery.code"
-              :maxlength="4"
-              placeholder-class="codeNum-input"
-              placeholder="请输入验证码"
-          />
-        </view>
-      </view>
-      <view
-          :class="disabled === true ? 'on' : ''"
-          :disabled="disabled"
-          class="getcode"
-          @click="codede"
-      >{{ text }}
-      </view>
-    </view>
-    <view class="mar-top-60">
-      <view
-          class="registerBut mar-top-100"
-          @click="login"
-      >登录
-      </view>
-    </view>
-  </view>
+			<text style="color:#3f9b6a;font-weight:bold;font-size:30px;">锦江公园</text>
+		</view>
+		<view class="iphoneNum-box flex-row-plus flex-items">
+			<view style="margin-right: 30rpx">
+				<image class="loginIcon"
+					src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/phone.png"></image>
+			</view>
+			<view>
+				<input v-model="loginQuery.account" placeholder-class="iphoneNum-input" type="number" maxlength='11'
+					placeholder="请输入您的手机号" />
+			</view>
+		</view>
+		<view class="flex-row-plus">
+			<view class="code-box">
+				<view style="margin-right: 30rpx">
+					<image class="loginIcon"
+						src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/code.png"></image>
+				</view>
+				<view>
+					<input v-model="loginQuery.code" :maxlength="6" placeholder-class="codeNum-input"
+						placeholder="请输入验证码" />
+				</view>
+			</view>
+			<view :class="disabled === true ? 'on' : ''" :disabled="disabled" class="getcode" @click="codede">{{ text }}
+			</view>
+		</view>
+		<view class="mar-top-60">
+			<view class="registerBut mar-top-100" @click="login">登录
+			</view>
+		</view>
+		<view class="agreement">
+			<image v-if="!agreement" src="../../static/images/none.png" mode="" @click="agreement=true"></image>
+			<image v-else src="../../static/images/solid.png" mode="" @click="agreement=false"></image>
+			<text class="font-color-999">登录即代表同意</text>
+			<text class="font-color-C5AA7B" @click="protocol('app_user_agreement')">《APP用户服务协议》</text>和
+			<text class="font-color-C5AA7B" @click="protocol('app_privacy_agreement')">《APP个人隐私协议》</text>
+		</view>
+	</view>
 </template>
 
 <script>
-import sendVerifyCode from "@/mixins/SendVerifyCode";
+	import sendVerifyCode from "@/mixins/SendVerifyCode";
 
-const NET = require('../../utils/request')
-const API = require('../../config/api')
-export default {
-  data() {
-    return {
-      loginQuery: {
-        account: '',
-        code: '',
-        salesId: '',
-      },
-      // 获取验证码
-      VerifyQuery: {
-        phone: ""
-      },
-      inviteSpell: {},
-      inviteSpelltype: false,
-      beforePage: undefined,
-      doubleBeforePage: undefined
-    }
-  },
-  mixins: [sendVerifyCode],
-  onLoad(options) {
-    if (options.inviteSpell == 1) {
-      this.inviteSpelltype = true
-      this.inviteSpell = uni.getStorageSync('inviteSpell');
-    }
-    this.loginQuery.salesId = uni.getStorageSync('salesId');
-    var pages = getCurrentPages()
-    if (pages.length >= 2) {
-      this.beforePage = pages[pages.length - 2]
-    }
-    if (pages.length >= 3) {
-      this.doubleBeforePage = pages[pages.length - 3]
-    }
-  },
-  methods: {
-    login() {
-      let phoneCodeVerification = /^[1][3-9][0-9]{9}$/;
-      if (this.loginQuery.account == '') {
-        uni.showToast({
-          title: '请输入手机号！',
-          duration: 2000,
-          icon: 'none'
-        });
-      } else if (!phoneCodeVerification.test(this.loginQuery.account)) {
-        uni.showToast({
-          title: '请输入正确的手机号！',
-          duration: 2000,
-          icon: 'none'
-        });
-      } else {
-        const that = this
-        // uni.showLoading({
-        //   mask: true,
-        //   title: '正在登录...',
-        //   duration: 2000,
-        // });
-        NET.request(API.Login, {
-          type: 2,
-          phone: this.loginQuery.account,
-          verificationCode: this.loginQuery.code
-        }, 'POST').then(res => {
-          uni.hideLoading()
-          const item = res.data
-          uni.setStorageSync('storage_key', item);
-          if (uni.getStorageSync("salesId")) {
-            let salesId = uni.getStorageSync("salesId")
-            let shopId = uni.getStorageSync("shopId")
-            this.bindSalesCustomer(salesId, shopId)
-            uni.removeStorageSync('salesId');
-            uni.removeStorageSync('shopId');
-          }
-		  
-          // 购物车右上角数量
-          NET.request(API.ShoppingCart, {}, 'GET').then(resCart => {
-            let cartNum = 0
-            resCart.data.forEach(shopItem => {
-              shopItem.skus.forEach(goodsItem => {
-                cartNum += goodsItem.number
-              })
-            })
-            if (cartNum > 0) {
-              uni.setTabBarBadge({
-                index: 2,
-                text: cartNum.toString()
-              })
-            }
-            console.log(cartNum)
-            uni.setStorageSync('allCartNum', cartNum)
-          })
-          if (this.inviteSpelltype == true) {
-            setTimeout(function () {
-              uni.reLaunch({
-                url: '../../pages_category_page1/goodsModule/inviteSpell?collageId=' +
-                    this.inviteSpell.collageId + '&orderId=' + this.inviteSpell
-                        .orderId + '&type=0' + '&productId=' + this.inviteSpell
-                        .productId + '&skuId=' + this.inviteSpell.skuId
-              })
-              uni.removeStorageSync('inviteSpell');
-            }, 2000)
-          } else {
-            if (that.beforePage && that.beforePage.route !==
-                'pages_category_page2/userModule/accountLogin' &&
-                that.beforePage.route !== 'pages_category_page2/userModule/login' &&
-                that.beforePage.route !== 'pages_category_page2/userModule/register') {
-              console.log(19)
-              uni.navigateBack({
-                delta: 1
-              })
-            } else if (that.doubleBeforePage && that.doubleBeforePage.route !==
-                'pages_category_page2/userModule/accountLogin' &&
-                that.doubleBeforePage.route !== 'pages_category_page2/userModule/login' &&
-                that.doubleBeforePage.route !== 'pages_category_page2/userModule/register') {
-              uni.navigateBack({
-                delta: 2
-              })
-            } else {
-				NET.request(API.GetUser, {}, 'GET').then(res => {
-					let MsgList ={
-						username:res.data.name,
-						userId:res.data.buyerUserId,
-						phoneNumber:res.data.phone,
-						 createTime:this.getCurrentDateTime(),
-					}
-					NET.request(API.DengJi, MsgList, 'POST').then(res => {
-						
+	const NET = require('../../utils/request')
+	const API = require('../../config/api')
+	export default {
+		data() {
+			return {
+				loginQuery: {
+					account: '',
+					code: '',
+					salesId: '',
+				},
+				// 获取验证码
+				VerifyQuery: {
+					phone: ""
+				},
+				agreement: false,
+				inviteSpell: {},
+				inviteSpelltype: false,
+				beforePage: undefined,
+				doubleBeforePage: undefined,
+				text: '获取验证码',
+				disabled: false,
+				remainingTime: 0, // 剩余倒计时时间
+			}
+		},
+		mixins: [sendVerifyCode],
+		onLoad(options) {
+			if (options.inviteSpell == 1) {
+				this.inviteSpelltype = true
+				this.inviteSpell = uni.getStorageSync('inviteSpell');
+			}
+			this.loginQuery.salesId = uni.getStorageSync('salesId');
+			var pages = getCurrentPages()
+			if (pages.length >= 2) {
+				this.beforePage = pages[pages.length - 2]
+			}
+			if (pages.length >= 3) {
+				this.doubleBeforePage = pages[pages.length - 3]
+			}
+		},
+		methods: {
+			login() {
+				let phoneCodeVerification = /^[1][3-9][0-9]{9}$/;
+				if (this.loginQuery.account == '') {
+					uni.showToast({
+						title: '请输入手机号！',
+						duration: 2000,
+						icon: 'none'
+					});
+				} else if (!phoneCodeVerification.test(this.loginQuery.account)) {
+					uni.showToast({
+						title: '请输入正确的手机号！',
+						duration: 2000,
+						icon: 'none'
+					});
+				} else if (this.loginQuery.code == '') {
+					uni.showToast({
+						title: '请获取验证码！',
+						duration: 2000,
+						icon: 'none'
 					})
-				})
-              setTimeout(function () {
-                uni.switchTab({
-                  url: '../../pages/tabbar/user/index'
-                })
-              }, 600)
-            }
-          }
-        }).catch(res => {
-          console.log('Login failed')
-          console.dir(res)
-          uni.hideLoading()
-          uni.showToast({
-            title: res.data.message,
-            duration: 2000,
-            icon: 'none',
-          });
-        })
-      }
+				} else if (!this.agreement) {
+					uni.showToast({
+						title: '请先阅读并同意《用户服务协议和个人隐私协议》',
+						duration: 2000,
+						icon: 'none'
+					});
+				} else {
+					const that = this
+					// uni.showLoading({
+					//   mask: true,
+					//   title: '正在登录...',
+					//   duration: 2000,
+					// });
+					NET.request(API.Login, {
+						phone: this.loginQuery.account,
+						verificationCode: this.loginQuery.code
+					}, 'POST').then(res => {
+						uni.hideLoading()
+						const item = res.data
+						uni.setStorageSync('storage_key', item);
+						if (uni.getStorageSync("salesId")) {
+							let salesId = uni.getStorageSync("salesId")
+							let shopId = uni.getStorageSync("shopId")
+							this.bindSalesCustomer(salesId, shopId)
+							uni.removeStorageSync('salesId');
+							uni.removeStorageSync('shopId');
+						}
+
+						// 购物车右上角数量
+						NET.request(API.ShoppingCart, {}, 'GET').then(resCart => {
+							let cartNum = 0
+							resCart.data.forEach(shopItem => {
+								shopItem.skus.forEach(goodsItem => {
+									cartNum += goodsItem.number
+								})
+							})
+							if (cartNum > 0) {
+								uni.setTabBarBadge({
+									index: 2,
+									text: cartNum.toString()
+								})
+							}
+							console.log(cartNum)
+							uni.setStorageSync('allCartNum', cartNum)
+						})
+						if (this.inviteSpelltype == true) {
+							setTimeout(function() {
+								uni.reLaunch({
+									url: '../../pages_category_page1/goodsModule/inviteSpell?collageId=' +
+										this.inviteSpell.collageId + '&orderId=' + this.inviteSpell
+										.orderId + '&type=0' + '&productId=' + this.inviteSpell
+										.productId + '&skuId=' + this.inviteSpell.skuId
+								})
+								uni.removeStorageSync('inviteSpell');
+							}, 2000)
+						} else {
+							if (that.beforePage && that.beforePage.route !==
+								'pages_category_page2/userModule/accountLogin' &&
+								that.beforePage.route !== 'pages_category_page2/userModule/login' &&
+								that.beforePage.route !== 'pages_category_page2/userModule/register') {
+								console.log(19)
+								uni.navigateBack({
+									delta: 1
+								})
+							} else if (that.doubleBeforePage && that.doubleBeforePage.route !==
+								'pages_category_page2/userModule/accountLogin' &&
+								that.doubleBeforePage.route !== 'pages_category_page2/userModule/login' &&
+								that.doubleBeforePage.route !== 'pages_category_page2/userModule/register') {
+								uni.navigateBack({
+									delta: 2
+								})
+							} else {
+								NET.request(API.GetUser, {}, 'GET').then(res => {
+									let MsgList = {
+										username: res.data.name,
+										userId: res.data.buyerUserId,
+										phoneNumber: res.data.phone,
+										createTime: this.getCurrentDateTime(),
+									}
+									NET.request(API.DengJi, MsgList, 'POST').then(res => {
+
+									})
+								})
+								setTimeout(function() {
+									uni.switchTab({
+										url: '../../pages/tabbar/user/index'
+									})
+								}, 600)
+							}
+						}
+					}).catch(res => {
+						console.log('Login failed')
+						console.dir(res)
+						uni.hideLoading()
+						uni.showToast({
+							title: res.data.message,
+							duration: 2000,
+							icon: 'none',
+						});
+					})
+				}
+
+			},
+			// 获取时间
+			getCurrentDateTime() {
+				const now = new Date();
+				const year = now.getFullYear();
+				const month = String(now.getMonth() + 1).padStart(2, '0'); // 月份是从0开始的，所以需要+1
+				const day = String(now.getDate()).padStart(2, '0');
+				const hours = String(now.getHours()).padStart(2, '0');
+				const minutes = String(now.getMinutes()).padStart(2, '0');
+				const seconds = String(now.getSeconds()).padStart(2, '0');
+
+				return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+			},
+			// 获取验证码
+			codede() {
+				if (this.disabled) return
+				this.getVerify()
 
-    },
-	// 获取时间
-	getCurrentDateTime() {
-	  const now = new Date();
-	  const year = now.getFullYear();
-	  const month = String(now.getMonth() + 1).padStart(2, '0'); // 月份是从0开始的，所以需要+1
-	  const day = String(now.getDate()).padStart(2, '0');
-	  const hours = String(now.getHours()).padStart(2, '0');
-	  const minutes = String(now.getMinutes()).padStart(2, '0');
-	  const seconds = String(now.getSeconds()).padStart(2, '0');
-	
-	  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-	},
-    // 获取验证码
-    codede() {
-      this.getVerify()
-    },
-    getVerify() {
-      let phoneCodeVerification = /^[1][3-9][0-9]{9}$/;
-      if (this.loginQuery.account == '') {
-        uni.showToast({
-          title: '请输入手机号！',
-          duration: 2000,
-          icon: 'none'
-        });
-      } else if (!phoneCodeVerification.test(this.loginQuery.account)) {
-        uni.showToast({
-          title: '请输入正确的手机号！',
-          duration: 2000,
-          icon: 'none'
-        });
-      } else {
-        this.VerifyQuery.phone = this.loginQuery.account
+			},
+			getVerify() {
+				let phoneCodeVerification = /^[1][3-9][0-9]{9}$/;
+				if (this.loginQuery.account === '') {
+					uni.showToast({
+						title: '请输入手机号！',
+						duration: 2000,
+						icon: 'none'
+					});
+				} else if (!phoneCodeVerification.test(this.loginQuery.account)) {
+					uni.showToast({
+						title: '请输入正确的手机号！',
+						duration: 2000,
+						icon: 'none'
+					});
+				} else {
+					this.disabled = true;
+					this.remainingTime = 60;
+					this.text = `${this.remainingTime}s后重试`;
 
-        NET.request(API.Verify, {
-          phone: this.VerifyQuery.phone,
-        }, 'GET').then(res => {
-          this.sendCode()
-        }).catch(res => {
-          uni.showToast({
-            title: res.data.message,
-            duration: 1000,
-            icon: 'none'
-          });
-        })
-      }
+					const timer = setInterval(() => {
+						this.remainingTime--;
+						if (this.remainingTime > 0) {
+							this.text = `${this.remainingTime}s后重试`;
+						} else {
+							clearInterval(timer);
+							this.disabled = false; // 倒计时结束，启用按钮
+							this.text = '获取验证码';
+						}
+					}, 1000);
 
-    },
-    //绑定关系
-    bindSalesCustomer(salesId, storeId) {
-      if (salesId && storeId) {
-        //如果已登录，静默绑定客户关系，否则跳转到登录页面
-        NET.request(API.BindSalesCustomer, {
-          shopId: storeId,
-          distributorId: salesId
-        }, 'POST').then(res => {
-          uni.showToast({
-            title: "绑定成功",
-            icon: "none"
-          })
-        }).catch(res => {
-          uni.showToast({
-            title: res.data.message,
-            icon: "none"
-          })
-        })
+					this.VerifyQuery.phone = this.loginQuery.account;
 
-      }
-    }
-  }
-}
+					NET.request(API.verification, {
+						phone: this.VerifyQuery.phone
+					}, 'POST').then(res => {
+						// 如果 sendCode 方法有实际用途，需要定义该方法
+						// this.sendCode(); 
+						console.log(res);
+					}).catch(res => {
+						uni.showToast({
+							title: res.data.message,
+							duration: 1000,
+							icon: 'none'
+						});
+					});
+				}
+			},
+			//绑定关系
+			bindSalesCustomer(salesId, storeId) {
+				if (salesId && storeId) {
+					//如果已登录，静默绑定客户关系，否则跳转到登录页面
+					NET.request(API.BindSalesCustomer, {
+						shopId: storeId,
+						distributorId: salesId
+					}, 'POST').then(res => {
+						uni.showToast({
+							title: "绑定成功",
+							icon: "none"
+						})
+					}).catch(res => {
+						uni.showToast({
+							title: res.data.message,
+							icon: "none"
+						})
+					})
+
+				}
+			},
+			// 多商户用户协议
+			protocol(type) {
+				uni.navigateTo({
+					url: 'protocol?type=' + type
+				})
+			},
+		}
+	}
 </script>
 
 <style lang="scss">
-.container {
-  background-color: #FFFFFF;
-  height: 100vh;
+	.container {
+		background-color: #FFFFFF;
+		height: 100vh;
+
+		.login-logoBox {
+			margin-top: -300rpx;
+
+			.login-logo {
+				width: 234rpx;
+				height: 193rpx;
+			}
+		}
 
-  .login-logoBox {
-    margin-top: -300rpx;
+		.iphoneNum-box {
+			margin-top: 100rpx;
+			border-bottom: 1rpx solid #DDDDDD;
+			height: 100rpx;
+			width: 600rpx;
 
-    .login-logo {
-      width: 234rpx;
-      height: 193rpx;
-    }
-  }
+			.loginIcon {
+				width: 40rpx;
+				height: 53rpx;
+			}
 
-  .iphoneNum-box {
-    margin-top: 100rpx;
-    border-bottom: 1rpx solid #DDDDDD;
-    height: 100rpx;
-    width: 600rpx;
+			.iphoneNum-input {
+				color: #999999;
+				font-size: 28rpx;
+				font-weight: 400;
+			}
+		}
 
-    .loginIcon {
-      width: 40rpx;
-      height: 53rpx;
-    }
+		.passwordNum-box {
+			border-bottom: 1rpx solid #DDDDDD;
+			height: 100rpx;
+			width: 600rpx;
 
-    .iphoneNum-input {
-      color: #999999;
-      font-size: 28rpx;
-      font-weight: 400;
-    }
-  }
+			.passwordNum-input {
+				color: #999999;
+				font-size: 28rpx;
+				font-weight: 400;
+				width: 346rpx;
+			}
+		}
 
-  .passwordNum-box {
-    border-bottom: 1rpx solid #DDDDDD;
-    height: 100rpx;
-    width: 600rpx;
+		.code-box {
+			border-bottom: 1rpx solid #DDDDDD;
+			height: 100rpx;
+			width: 360rpx;
+			display: flex;
+			flex-direction: row;
+			justify-content: space-between;
+			align-items: center;
 
-    .passwordNum-input {
-      color: #999999;
-      font-size: 28rpx;
-      font-weight: 400;
-      width: 346rpx;
-    }
-  }
+			.loginIcon {
+				width: 44rpx;
+				height: 50rpx;
+			}
 
-  .code-box {
-    border-bottom: 1rpx solid #DDDDDD;
-    height: 100rpx;
-    width: 360rpx;
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    align-items: center;
+			.code-lab {
+				width: 200rpx;
+			}
 
-    .loginIcon {
-      width: 44rpx;
-      height: 50rpx;
-    }
+			.codeNum-input {
+				color: #999999;
+				font-size: 28rpx;
+				font-weight: 400;
+			}
+		}
 
-    .code-lab {
-      width: 200rpx;
-    }
+		.getcode {
+			background-color: #39be7a;
+			height: 100rpx;
+			width: 230rpx;
+			display: flex;
+			flex-direction: row;
+			justify-content: center;
+			align-items: center;
+			margin-left: 20rpx;
+			color: #FFFFFF;
+		}
 
-    .codeNum-input {
-      color: #999999;
-      font-size: 28rpx;
-      font-weight: 400;
-    }
-  }
+		.registerBut {
+			background: #3f9b6a;
+			color: #FFEBC4;
+			height: 100rpx;
+			width: 600rpx;
+			text-align: center;
+			line-height: 100rpx;
+			margin-top: 30rpx;
+		}
 
-  .getcode {
-    background-color: #39be7a;
-    height: 100rpx;
-    width: 230rpx;
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    align-items: center;
-    margin-left: 20rpx;
-    color: #FFFFFF;
-  }
+		.agreement {
+			margin: 100rpx 50rpx;
+			line-height: 50rpx;
 
-  .registerBut {
-    background: #3f9b6a;
-    color: #FFEBC4;
-    height: 100rpx;
-    width: 600rpx;
-    text-align: center;
-    line-height: 100rpx;
-    margin-top: 30rpx;
-  }
-}
-</style>
+			image {
+				width: 34rpx;
+				height: 34rpx;
+				margin-right: 15upx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/ceres-uniapp-master/pages_category_page2/userModule/collection.vue b/ceres-uniapp-master/pages_category_page2/userModule/collection.vue
index 28eec09..67e9eee 100644
--- a/ceres-uniapp-master/pages_category_page2/userModule/collection.vue
+++ b/ceres-uniapp-master/pages_category_page2/userModule/collection.vue
@@ -34,7 +34,7 @@
 											class="cart-select-img"></image>
 									</view>
 									<view class="infoCent flex-items">
-										<image class="product-img default-img" mode="aspectFill" :src="item.image" />
+										<image class="product-img default-img" mode="aspectFill" :src="$baseURL+item.image" />
 										<!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
 										<view class="title-wrap mar-left-20 priceBox">
 											<text
@@ -107,7 +107,7 @@
 								<view class="infoCent">
 									<view class="flex-row-plus flex-sp-between flex-items-plus wid">
 										<view class="flex-items-plus flex-row pad-topbot-10">
-											<image class="head-img" mode="aspectFill" :src="item.shopLogo" />
+											<image class="head-img" mode="aspectFill" :src="$baseURL+item.shopLogo" />
 											<!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
 											<view class="title-wrap mar-left-20">
 												<text class="title u-line-2 shopName">{{ item.shopName }}</text>
@@ -123,7 +123,7 @@
 										<view class="itemImgBox" v-for="(sItem, sIndex) of item.productList"
 											:key="sIndex"
 											@click.stop="goodsDateils(sItem.shopId,sItem.productId,sItem.skuId)">
-											<image :src="sItem.image" class="pic-img default-img"></image>
+											<image :src="$baseURL+sItem.image" class="pic-img default-img"></image>
 										</view>
 									</view>
 								</view>
diff --git a/ceres-uniapp-master/pages_category_page2/userModule/footprintList.vue b/ceres-uniapp-master/pages_category_page2/userModule/footprintList.vue
index 3c9c3bd..b170d26 100644
--- a/ceres-uniapp-master/pages_category_page2/userModule/footprintList.vue
+++ b/ceres-uniapp-master/pages_category_page2/userModule/footprintList.vue
@@ -28,7 +28,7 @@
                   <image v-if="item.selected == 1" @click.stop="footItemSel(index,findex,0)" src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/selectActive.png" class="cart-select-img"></image>
                   <image v-else @click.stop="footItemSel(index,findex,1)" src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/selectEmpty.png" class="cart-select-img"></image>
                 </view>
-                <image class="product-img default-img" mode="aspectFill" :src="item.image" />
+                <image class="product-img default-img" mode="aspectFill" :src="$baseURL+item.image" />
                 <!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
                 <view class="title-wrap mar-left-20">
                   <text class="title u-line-2 fs28">{{ item.productName }}</text>
diff --git a/ceres-uniapp-master/pages_category_page2/userModule/login.vue b/ceres-uniapp-master/pages_category_page2/userModule/login.vue
index 82fce20..b4fefa8 100644
--- a/ceres-uniapp-master/pages_category_page2/userModule/login.vue
+++ b/ceres-uniapp-master/pages_category_page2/userModule/login.vue
@@ -21,10 +21,10 @@
 			<view class="loginBut" v-if="noMp" @click="goLogin">手机号登录</view>
 			<!-- #endif -->
 		</view>
-		<view class="flex-row-plus mar-top-30" v-if="noMp">
+		<!-- <view class="flex-row-plus mar-top-30" v-if="noMp">
 			<text class="font-color-C5AA7B">还没有账号，</text>
 			<view class="register-text" @click="goRegister">去注册</view>
-		</view>
+		</view> -->
 	</view>
 </template>
 
diff --git a/ceres-uniapp-master/pages_category_page2/userModule/register.vue b/ceres-uniapp-master/pages_category_page2/userModule/register.vue
index 666b5bd..ca7e264 100644
--- a/ceres-uniapp-master/pages_category_page2/userModule/register.vue
+++ b/ceres-uniapp-master/pages_category_page2/userModule/register.vue
@@ -16,7 +16,7 @@
 						maxlength="11" placeholder="请输入您的手机号" />
 				</view>
 			</view>
-			<view class="flex-row-plus mar-top-20">
+			<view class="flex-row-plus">
 				<view class="code-box">
 					<view>
 						<image class="loginIcon" src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/code.png"></image>
diff --git a/merchant-web-master/src/App.vue b/merchant-web-master/src/App.vue
index ee221ff..1b48f03 100644
--- a/merchant-web-master/src/App.vue
+++ b/merchant-web-master/src/App.vue
@@ -26,6 +26,25 @@ export default {
       this.getPrivacySwitch();
     }
   },
+  computed: {
+      fontFaceStyle() {
+        return `
+          @font-face {
+            font-family: 'Alibaba-PuHuiTi-Bold';
+            src: url('${this.$fontBold}');
+          }
+          @font-face {
+            font-family: 'Alibaba-PuHuiTi-Regular';
+            src: url('${this.$fontRegular}');
+          }
+        `;
+      }
+    },
+    mounted() {
+        const styleElement = document.createElement('style');
+        styleElement.innerHTML = this.fontFaceStyle;
+        document.head.appendChild(styleElement);
+      },
   methods: {
     getPrivacySwitch() {
       getPrivacySwitch().then((res) => {
@@ -406,7 +425,7 @@ export default {
     }
    .bian_css{
       margin:auto;
-       max-height:600px;
+       max-height:720px;
        overflow-y: auto;
         .el-dialog__body {
           padding: 0px;
@@ -418,7 +437,7 @@ export default {
           border-bottom: 1px solid #EFEFEF;
         }
         .el-dialog__title {
-         font-size: 14px;
+         font-size: 18px;
          color: #000000e6;
         }
         .el-date-table td.available:hover{
diff --git a/merchant-web-master/src/assets/Alibaba-PuHuiTi-Bold.ttf b/merchant-web-master/src/assets/Alibaba-PuHuiTi-Bold.ttf
deleted file mode 100644
index af57de0..0000000
--- a/merchant-web-master/src/assets/Alibaba-PuHuiTi-Bold.ttf
+++ /dev/null
diff --git a/merchant-web-master/src/assets/Alibaba-PuHuiTi-Light.ttf b/merchant-web-master/src/assets/Alibaba-PuHuiTi-Light.ttf
deleted file mode 100644
index 6962c16..0000000
--- a/merchant-web-master/src/assets/Alibaba-PuHuiTi-Light.ttf
+++ /dev/null
diff --git a/merchant-web-master/src/assets/Alibaba-PuHuiTi-Regular.ttf b/merchant-web-master/src/assets/Alibaba-PuHuiTi-Regular.ttf
deleted file mode 100644
index 9f8ab8d..0000000
--- a/merchant-web-master/src/assets/Alibaba-PuHuiTi-Regular.ttf
+++ /dev/null
diff --git a/merchant-web-master/src/assets/font.css b/merchant-web-master/src/assets/font.css
index 133a372..a4c4194 100644
--- a/merchant-web-master/src/assets/font.css
+++ b/merchant-web-master/src/assets/font.css
@@ -1,9 +1,9 @@
-@font-face {
-  font-family: "Alibaba-PuHuiTi-Regular"; /* Corrected */
+/* @font-face {
+  font-family: "Alibaba-PuHuiTi-Regular";
   src: url("./Alibaba-PuHuiTi-Regular.ttf");
 }
 
 @font-face {
-  font-family: "Alibaba-PuHuiTi-Bold"; /* Corrected */
+  font-family: "Alibaba-PuHuiTi-Bold"; 
   src: url("./Alibaba-PuHuiTi-Bold.ttf");
-}
+} */
diff --git a/merchant-web-master/src/components/Tinymce/components/EditorImage.vue b/merchant-web-master/src/components/Tinymce/components/EditorImage.vue
index 5f5c836..1de6c22 100644
--- a/merchant-web-master/src/components/Tinymce/components/EditorImage.vue
+++ b/merchant-web-master/src/components/Tinymce/components/EditorImage.vue
@@ -46,7 +46,7 @@
 <script>
 // import { getToken } from 'api/qiniu'
 // import db from "@/utils/localstorage";
-import { uploadUrl } from '@/utils/request'
+import { upUrl } from '@/utils/request'
 import { getToken } from '@/utils/auth'
 export default {
   name: 'EditorSlideUpload',
@@ -64,7 +64,7 @@ export default {
       headers: {
         'Authorization-business': getToken()
       },
-      action: uploadUrl,
+      action: upUrl,
       dataObj: {
         folderId: 1
       }
@@ -99,7 +99,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 = response.data.url
+          this.listObj[objKeyArr[i]].url =this.$baseURL+response.data.url
           this.listObj[objKeyArr[i]].hasSuccess = true
           return
         }
diff --git a/merchant-web-master/src/layout/components/Sidebar/index.vue b/merchant-web-master/src/layout/components/Sidebar/index.vue
index 829b320..63ce74f 100644
--- a/merchant-web-master/src/layout/components/Sidebar/index.vue
+++ b/merchant-web-master/src/layout/components/Sidebar/index.vue
@@ -12,6 +12,7 @@
         :active-text-color="variables.menuActiveText"
         :collapse-transition="false"
         mode="vertical"
+        style="padding: 10px 0;"
       >
         <sidebar-item
           v-for="(route,index) in routers"
diff --git a/merchant-web-master/src/main.js b/merchant-web-master/src/main.js
index 3fec519..de10504 100644
--- a/merchant-web-master/src/main.js
+++ b/merchant-web-master/src/main.js
@@ -21,8 +21,12 @@ Vue.prototype.$encryptall = encryptall;
 let host = window.location.host;
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528' || host === 'localhost:9529') {
   Vue.prototype.$baseURL ='https://jy.scjysm.asia:18086/cdwlMall'
+   Vue.prototype.$fontBold = `https://jy.scjysm.asia:18086/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Bold.ttf`
+  Vue.prototype.$fontRegular = `https://jy.scjysm.asia:18086/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Regular.ttf`
 } else {
   Vue.prototype.$baseURL =`${window.location.protocol}//${window.location.host}/cdwlMall`
+   Vue.prototype.$fontBold = `${window.location.protocol}//${window.location.host}/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Bold.ttf`
+  Vue.prototype.$fontRegular = `${window.location.protocol}//${window.location.host}/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Regular.ttf`
 }
 // if (process.env.NODE_ENV === 'production') {
 //   const { mockXHR } = require('../mock')
diff --git a/merchant-web-master/src/utils/request.js b/merchant-web-master/src/utils/request.js
index 42d2290..ed59b96 100644
--- a/merchant-web-master/src/utils/request.js
+++ b/merchant-web-master/src/utils/request.js
@@ -22,7 +22,7 @@ if (host == '172.16.61.48' || host == '172.16.61.49:5173') {
   // PREFIX = 'http://8.130.38.56:8027/business-server';
   //  PREFIX = 'https://jy.scjysm.asia:18086/merchant-business';
   // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
-  PREFIX = 'http://10.0.0.51:9004';
+  PREFIX = 'http://192.168.2.138:9004';
 }else{
   // PREFIX = '/merchant-business';
   // PREFIX = 'http://8.130.38.56:9004';
@@ -37,6 +37,7 @@ const service = axios.create({
   timeout: 300000 // request timeout
 })
 export const uploadUrl = `${baseURL}/miniio/upload`
+export const upUrl = `${baseURL}/miniio/uploadQuestion`
 // export const uploadUrl = `${baseURL}/file/upload`
 export const WXuploadUrl = `${baseURL}/file/uploadWxMedia` // 直播上传专用
 //export const QYuploadUrl = `${baseURL}/file/uploadQyMedia` // 微信客服上传专用
diff --git a/merchant-web-master/src/views/commodity/commodityList/commodityGroup.vue b/merchant-web-master/src/views/commodity/commodityList/commodityGroup.vue
index f28ff2d..57da330 100644
--- a/merchant-web-master/src/views/commodity/commodityList/commodityGroup.vue
+++ b/merchant-web-master/src/views/commodity/commodityList/commodityGroup.vue
@@ -44,14 +44,14 @@
           <div class="tableBox">
             <el-table
               ref="multipleTable"
-              :data="products"
+              :data="products.slice((productsPage - 1) * productsPageSize, productsPage * productsPageSize)"
                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
               tooltip-effect="dark"
-              max-height="400"
+           
             >
               <el-table-column label="产品主图" width="220" align="center">
                 <template slot-scope="scope">
-                  <img height="80" width="80" :src="scope.row.image " alt srcset>
+                  <img height="80" width="80" :src="$baseURL+scope.row.image " alt srcset>
                 </template>
               </el-table-column>
               <el-table-column prop="productName" label="产品名称" width="220" align="center" />
@@ -59,12 +59,13 @@
               <el-table-column prop="stockNumber" label="库存（件）" align="center" show-overflow-tooltip />
             </el-table>
             <div class="fenye">
+              <div style="line-height: 200%;">共{{ products.length}}条</div>
               <el-pagination
                 :current-page="productsPage"
                 :page-sizes="[5, 10, 20, 50, 100]"
                 :page-size="productsPageSize"
                background
-               layout="prev, pager, next,total"
+               layout="prev, pager, next"
                 :total="products.length"
                 @size-change="handleSizeChange"
                 @current-change="handleCurrentChange"
@@ -73,9 +74,9 @@
           </div>
         </div>
         <div class="submitBox">
-          <el-button style="background-color: #3F9B6A;color: #fff" @click="addGroup('ruleForm')">提 交</el-button>
           <el-button   class="buttonHover"
-              style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="closeAddGroup">取 消</el-button>
+          style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="closeAddGroup">取 消</el-button>
+          <el-button style="background-color: #3F9B6A;color: #fff" @click="addGroup('ruleForm')">提 交</el-button>
         </div>
       </div>
     </div>
@@ -115,7 +116,7 @@
           :data="shopListData"
     :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
           tooltip-effect="dark"
-          max-height="550"
+      
           @selection-change="handleSelectionChange"
         >
           <el-table-column
@@ -131,20 +132,25 @@
           <el-table-column prop="originalPrice" label="价格（元）" align="center" show-overflow-tooltip />
           <el-table-column prop="stockNumber" label="库存（件）" align="center" show-overflow-tooltip />
         </el-table>
-        <div class="fenye">
+        <div class="fenye" style="padding: 10px;">
+          <div>共{{ shopTotal }}条</div>
           <el-pagination
             :current-page="formInline.page"
             :page-sizes="[10, 20, 50, 100]"
             :page-size="formInline.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
+            layout="prev,pager,next"
             :total="shopTotal"
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
           />
-          <span slot="footer" class="dialog-footer">
+         
+        </div>
+        <div class="dialog-footer" style="padding:10px 20px ;">
+         
             <el-button type="primary" @click="saveIdList">确 定</el-button>
-            <el-button @click="closeSelect">取 消</el-button>
-          </span>
+            <el-button @click="closeSelect" class="buttonHover"
+            style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取 消</el-button>
+       
         </div>
       </div>
     </el-dialog>
@@ -207,7 +213,8 @@
       <div class="fenye">
         <span slot="footer" class="dialog-footer">
           <el-button type="primary" @click="saveOptions">确 定</el-button>
-          <el-button @click="closeOptions">取 消</el-button>
+          <el-button @click="closeOptions" class="buttonHover"
+          style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取 消</el-button>
         </span>
       </div>
     </el-dialog>
@@ -299,7 +306,7 @@ export default {
       },
       products: [], // 确定已选商品
       productsPage: 1,
-      productsPageSize: 5,
+      productsPageSize: 10,
       selectConditions: [], // 当前选择筛选条件
       // 分组选择
       selectGroup: '1',
@@ -633,7 +640,6 @@ export default {
     width: 100%;
     margin: 20px 0;
     display: flex;
-    justify-content: space-around;
   }
   .isSelectList {
     h3 {
@@ -739,6 +745,8 @@ export default {
 /*}*/
 .fenye {
   margin-top: 30px;
+  display: flex;
+  justify-content: space-between;
 }
 .fenye /deep/ .dialog-footer {
   margin: 30px auto 0 auto;
@@ -765,6 +773,7 @@ export default {
 .formSearch /deep/ .el-form {
   display: flex;
   flex-wrap: wrap;
+  padding: 10px;
 }
 .btnBox /deep/ .el-radio {
   margin-right: 8px;
diff --git a/merchant-web-master/src/views/commodity/commodityList/index.vue b/merchant-web-master/src/views/commodity/commodityList/index.vue
index cb27bcb..7f3750d 100644
--- a/merchant-web-master/src/views/commodity/commodityList/index.vue
+++ b/merchant-web-master/src/views/commodity/commodityList/index.vue
@@ -1,8 +1,7 @@
 <!-- 商品分组 -->
 <template>
   <div style="padding: 0 10px;background-color:#f7f7f7;">
-    <div class="tab_show">
-
+    <div class="tab_show" v-if="commidyVisible==false && isVisible==false">
       <!-- 搜索 -->
       <div class="formSearch">
         <el-form :inline="true" :model="formInline" class="demo-form-inline">
@@ -34,7 +33,7 @@
             <template slot-scope="scope">{{ scope.row.number }}</template>
           </el-table-column>
           <el-table-column prop="updateTime" label="修改时间" width="220" />
-          <el-table-column label="操作" show-overflow-tooltip>
+          <el-table-column label="操作" show-overflow-tooltip  fixed="right">
             <template slot-scope="scope">
               <div class="btnList">
                 <div class="tableBtn greens" @click="edit(scope.row)">
@@ -63,13 +62,8 @@
       </div>
     </div>
     <!-- 新建分组弹框 -->
-    <el-dialog
-      :close-on-click-modal="false"
-      :title="title"
-      :type="type"
-      :visible.sync="isVisible"
-       custom-class="bian_css" width="65%"
-      top="50px"
+    <div
+      v-if="isVisible"
     >
       <el-form :model="sizeForm">
         <el-form-item label="分组封面" prop="fileLength" />
@@ -95,22 +89,17 @@
           <el-button @click="isVisible = false">取消</el-button>
         </el-form-item>
       </el-form>
-    </el-dialog>
+    </div>
 
-    <el-dialog
-      title="活动报名"
-      :visible.sync="commidyVisible"
-      custom-class="bian_css" width="65%"
-      center
-      top="10vh"
-      :close-on-click-modal="false"
+    <div
+      v-if="commidyVisible"
     >
       <CommGroup
         :group-id="shopGroupId"
         @cancel="commidyVisible = false"
         @reload="search"
       />
-    </el-dialog>
+    </div>
   </div>
 </template>
 
@@ -327,4 +316,28 @@ export default {
     }
   }
 }
+::v-deep .bian_css{
+      margin:auto;
+       max-height:840px;
+       overflow-y: auto;
+        .el-dialog__body {
+          padding: 0px;
+          background-color: #fff;
+        }
+        .el-dialog__header {
+          background-color: #fff;
+         padding:10px 20px 10px 20px;
+          border-bottom: 1px solid #EFEFEF;
+        }
+        .el-dialog__title {
+         font-size: 14px;
+         color: #000000e6;
+        }
+        .el-date-table td.available:hover{
+          background-color:#3F9B6A;
+        }
+      .el-date-table td.start-date span{
+          background-color:#3F9B6A;
+        }
+      }
 </style>
diff --git a/merchant-web-master/src/views/commodity/commoditySystem/addCommodity.vue b/merchant-web-master/src/views/commodity/commoditySystem/addCommodity.vue
index c90cd63..f726b88 100644
--- a/merchant-web-master/src/views/commodity/commoditySystem/addCommodity.vue
+++ b/merchant-web-master/src/views/commodity/commoditySystem/addCommodity.vue
@@ -30,7 +30,7 @@
     <!-- 商品 -->
     <div class="addCom common">
       <div v-if="active">
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px" style="padding: 40px 40px;">
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px" style="padding:10px 20px;">
           <div class="leftCom">
             <el-form-item label="商品名称" prop="productName">
               <el-input v-model="form.productName" maxlength="50" show-word-limit />
@@ -671,9 +671,10 @@ export default {
   margin: 10px 0;
   justify-content: space-around;
   align-items: unset;
+  width: 100%;
   .el-form{
     display: flex;
-    padding: 40px 0;
+    padding: 0px 10px 10px;
   }
   .leftCom {
     width: 65%;
diff --git a/merchant-web-master/src/views/commodity/commoditySystem/index.vue b/merchant-web-master/src/views/commodity/commoditySystem/index.vue
index 0451711..9e2616d 100644
--- a/merchant-web-master/src/views/commodity/commoditySystem/index.vue
+++ b/merchant-web-master/src/views/commodity/commoditySystem/index.vue
@@ -86,7 +86,7 @@
           <el-table-column prop="reject" label="驳回原因" show-overflow-tooltip />
           <el-table-column :formatter="row=>getBrandName(row)" label="品牌" show-overflow-tooltip />
           <el-table-column prop="createTime" label="创建时间" width="180" />
-          <el-table-column label="操作" width="300">
+          <el-table-column label="操作" width="180" fixed="right">
             <template slot-scope="scope">
               <div class="btnList">
                  <div @click="edit(scope.row)" class="tableBtn greens" >编辑</div>
@@ -196,7 +196,8 @@
         <el-button type="success" class="clearBtn" @click="clearProductMember">清除所有旧会员价</el-button>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="vipPriceVisible = false">取 消</el-button>
+        <el-button @click="vipPriceVisible = false" class="buttonHover"
+        style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取 消</el-button>
         <el-button type="primary" @click="vipPriceSubmit">确 定</el-button>
       </span>
     </el-dialog>
@@ -204,9 +205,9 @@
     <el-dialog
       :title="!commId ? '新增商品' : '编辑商品'"
       :visible.sync="commidyVisible"
-     custom-class="bian_css" width="65%"
+     custom-class="bian_css"  width="70%"
       center
-      top="10vh"
+      top="6vh"
       :close-on-click-modal="false"
       @before-close="closeModal"
       @close="closeModal"
@@ -673,6 +674,30 @@ export default {
 <style lang='scss' scoped>
 //@import url(); 引入公共css类
 @import url("../../../styles/elDialog.scss");
+::v-deep .bian_css{
+      margin:auto;
+       max-height:840px;
+       overflow-y: auto;
+        .el-dialog__body {
+          padding: 0px;
+          background-color: #fff;
+        }
+        .el-dialog__header {
+          background-color: #fff;
+         padding:10px 20px 10px 20px;
+          border-bottom: 1px solid #EFEFEF;
+        }
+        .el-dialog__title {
+         font-size: 14px;
+         color: #000000e6;
+        }
+        .el-date-table td.available:hover{
+          background-color:#3F9B6A;
+        }
+      .el-date-table td.start-date span{
+          background-color:#3F9B6A;
+        }
+      }
 .tab_show {
   padding: 0 20px 20px 20px;
   background-color:#fff;
@@ -746,4 +771,5 @@ export default {
     margin-top: 20px;
   }
 }
+
 </style>
diff --git a/merchant-web-master/src/views/comprehensive/OrderRhq/afterDetails.vue b/merchant-web-master/src/views/comprehensive/OrderRhq/afterDetails.vue
index 28b0c1a..1ef69d6 100644
--- a/merchant-web-master/src/views/comprehensive/OrderRhq/afterDetails.vue
+++ b/merchant-web-master/src/views/comprehensive/OrderRhq/afterDetails.vue
@@ -7,7 +7,7 @@
       <div class="cotent">
         <div class="left_part">
           <div class="order_info">
-            <h2>售后信息</h2>
+            <TitleWithCircle title="售后信息" style="margin-bottom: 15px;"/>
             <ul>
               <li>
                 <p>
@@ -61,7 +61,7 @@
             </ul>
           </div>
           <div class="goods_info">
-            <h2>商品信息</h2>
+     <TitleWithCircle title="商品信息" style="margin-bottom: 15px;"/>
             <div
               v-for="(item, index) in order.products"
               :key="index"
@@ -81,7 +81,7 @@
               <div class="good_details">
                 <ul>
                   <li>
-                    <img :src="item.image">
+                    <img :src="$baseURL+item.image">
                     <div class="details">
                       <p>{{ item.productName }}</p>
                       <div class="skuDetails">
@@ -118,7 +118,7 @@
             </div>
           </div>
           <div class="logistics_info">
-            <h2>售后记录</h2>
+            <TitleWithCircle title="售后记录" style="margin-bottom: 15px;"/>
             <div class="after_sales_record">
               <div
                 v-for="(item, index) in order.afterHistory"
@@ -319,8 +319,12 @@ import {
   confirmAndRefund,
   damaging
 } from '@/api/order'
+import TitleWithCircle from '@/components/top/index';
 export default {
   name: 'AfterDetails',
+  components: {
+      TitleWithCircle
+    },
   data() {
     return {
       loading: false,
diff --git a/merchant-web-master/src/views/dashboard/index.vue b/merchant-web-master/src/views/dashboard/index.vue
index 9348bd3..5e308b7 100644
--- a/merchant-web-master/src/views/dashboard/index.vue
+++ b/merchant-web-master/src/views/dashboard/index.vue
@@ -101,7 +101,7 @@ export default {
         this.draws(res.data.conversion)
 
         this.info = d
-        console.log(d.hotSellProducts)
+
       }
     },
 
diff --git a/merchant-web-master/src/views/distributor/achievement/humens.vue b/merchant-web-master/src/views/distributor/achievement/humens.vue
index a7a0ebf..b66992d 100644
--- a/merchant-web-master/src/views/distributor/achievement/humens.vue
+++ b/merchant-web-master/src/views/distributor/achievement/humens.vue
@@ -23,7 +23,7 @@
           </el-form-item>
 
         </el-form>
-      <div>
+        <div style="width: 20%;">  
         <el-button style="background-color: #3F9B6A;color: #fff" @click="search">查询</el-button>
         <el-button class="buttonHover"
               style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="clear">重置</el-button>
diff --git a/merchant-web-master/src/views/distributor/achievement/order.vue b/merchant-web-master/src/views/distributor/achievement/order.vue
index 9ef7def..eae67c5 100644
--- a/merchant-web-master/src/views/distributor/achievement/order.vue
+++ b/merchant-web-master/src/views/distributor/achievement/order.vue
@@ -33,7 +33,7 @@
             </el-select>
           </el-form-item>
         </el-form>
-        <div>  <el-button style="background-color: #3F9B6A;color: #fff"  @click="search">查询</el-button>
+        <div style="width: 20%;">  <el-button style="background-color: #3F9B6A;color: #fff"  @click="search">查询</el-button>
             <el-button class="buttonHover"
                   style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="clear">重置</el-button></div>
       </div>
diff --git a/merchant-web-master/src/views/distributor/achievement/programme.vue b/merchant-web-master/src/views/distributor/achievement/programme.vue
index 7829ee7..4133e9a 100644
--- a/merchant-web-master/src/views/distributor/achievement/programme.vue
+++ b/merchant-web-master/src/views/distributor/achievement/programme.vue
@@ -47,7 +47,7 @@
               >
                 <img
                   v-if="scope.row.levelLogo"
-                  :src="scope.row.levelLogo"
+                  :src="$baseURL+scope.row.levelLogo"
                   class="avatar"
                 >
                 <i v-else class="el-icon-plus avatar-uploader-icon" />
@@ -169,7 +169,7 @@ import {
   levelDelete,
   levelUpdateSelf
 } from '@/api/distributor'
-import { uploadUrl } from '@/utils/request'
+import { upUrl } from '@/utils/request'
 import { getToken } from '@/utils/auth'
 export default {
   data() {
@@ -179,7 +179,7 @@ export default {
         id: ''
       },
       tableData: [],
-      action: uploadUrl,
+      action: upUrl,
       headers: {
         'Authorization-business': getToken()
       },
diff --git a/merchant-web-master/src/views/marketing/coupon/add.vue b/merchant-web-master/src/views/marketing/coupon/add.vue
index fef05c6..1a975d5 100644
--- a/merchant-web-master/src/views/marketing/coupon/add.vue
+++ b/merchant-web-master/src/views/marketing/coupon/add.vue
@@ -128,7 +128,7 @@
           />
           <el-table-column label="产品主图" width="220" align="center">
             <template slot-scope="scope">
-              <img height="80" width="80" :src="scope.row.image " alt srcset>
+              <img height="80" width="80" :src="$baseURL+scope.row.image " alt srcset>
             </template>
           </el-table-column>
           <el-table-column prop="productName" label="产品名称" width="220" />
diff --git a/merchant-web-master/src/views/order/aftersale/afterDetails.vue b/merchant-web-master/src/views/order/aftersale/afterDetails.vue
index 626e8bb..0eeaa0f 100644
--- a/merchant-web-master/src/views/order/aftersale/afterDetails.vue
+++ b/merchant-web-master/src/views/order/aftersale/afterDetails.vue
@@ -7,7 +7,7 @@
       <div class="cotent">
         <div class="left_part">
           <div class="order_info">
-            <h2>售后信息</h2>
+            <TitleWithCircle title="售后信息" style="margin-bottom: 15px;"/>
             <ul>
               <li>
                 <p>
@@ -61,7 +61,7 @@
             </ul>
           </div>
           <div class="goods_info">
-            <h2>商品信息</h2>
+            <TitleWithCircle title="商品信息" style="margin-bottom: 15px;"/>
             <div
               v-for="(item, index) in order.products"
               :key="index"
@@ -118,7 +118,7 @@
             </div>
           </div>
           <div class="logistics_info">
-            <h2>售后记录</h2>
+            <TitleWithCircle title="售后记录" style="margin-bottom: 15px;"/>
             <div class="after_sales_record">
               <div
                 v-for="(item, index) in order.afterHistory"
@@ -319,8 +319,12 @@ import {
   confirmAndRefund,
   damaging
 } from '@/api/order'
+import TitleWithCircle from '@/components/top/index';
 export default {
   name: 'AfterDetails',
+  components: {
+      TitleWithCircle
+    },
   data() {
     return {
       loading: false,
diff --git a/merchant-web-master/src/views/order/pending/pendDetails.vue b/merchant-web-master/src/views/order/pending/pendDetails.vue
index 90700ae..92997cd 100644
--- a/merchant-web-master/src/views/order/pending/pendDetails.vue
+++ b/merchant-web-master/src/views/order/pending/pendDetails.vue
@@ -1,11 +1,11 @@
 <template>
-  <el-dialog :close-on-click-modal="false" title="详情" :visible.sync="visible" custom-class="bian_css" width="65%">
+  <el-dialog :close-on-click-modal="false" title="详情" :visible.sync="visible" custom-class="bian_css" width="70%">
     <div v-loading="loading" class="order_details">
       <!--      <el-button icon="el-icon-close" class="close" @click="close" />-->
       <div class="cotent">
         <div class="left_part">
           <div class="order_info">
-            <h2>订单信息</h2>
+            <TitleWithCircle title="订单信息" style="margin-bottom: 15px;"/>
             <ul>
               <li>
                 <p>
@@ -58,7 +58,7 @@
             </ul>
           </div>
           <div class="goods_info">
-            <h2>商品信息</h2>
+            <TitleWithCircle title="商品信息" style="margin-bottom: 15px;"/>
             <div
               v-for="(item, index) in order.products"
               :key="index"
@@ -106,7 +106,7 @@
           <!-- 未发货时物流信息显示去发货按钮 -->
           <!-- <div class="logistics_info" v-show="order.logisticsName && order.logisticsNum"> -->
           <div class="logistics_info">
-            <h2>物流信息</h2>
+            <TitleWithCircle title="物流信息" style="margin-bottom: 15px;"/>
             <!-- <p
             v-if="!order.logisticsNum"
             class="send_good"
@@ -138,7 +138,7 @@
         </div>
         <div class="right_part">
           <div class="pay_order_info">
-            <h2>下单人信息</h2>
+            <TitleWithCircle title="下单人信息" style="margin-bottom: 15px;"/>
             <p>下单账户: {{ order.customerName }}</p>
             <p>历史订单总数: {{ order.total }}个</p>
             <p>下单备注: {{ order.remark }}</p>
@@ -200,8 +200,12 @@
 
 <script>
 import { orderGetById, orderGetSelect, orderDilevery } from '@/api/order'
+import TitleWithCircle from '@/components/top/index';
 export default {
   name: 'PendDetails',
+  components: {
+      TitleWithCircle
+    },
   data() {
     return {
       visible: false,
@@ -224,7 +228,8 @@ export default {
         ]
       },
       companyList: [],
-      orderId: 0
+      orderId: 0,
+      loading:false
     }
   },
   // computed: {
diff --git a/merchant-web-master/src/views/salesSta/dataSta.vue b/merchant-web-master/src/views/salesSta/dataSta.vue
index 2819b62..d986b51 100644
--- a/merchant-web-master/src/views/salesSta/dataSta.vue
+++ b/merchant-web-master/src/views/salesSta/dataSta.vue
@@ -232,10 +232,11 @@
                       <el-table-column prop="multiply" label="销售金额"  :sortable="true" :sort-method="sortMethod"/>
                     </el-table>
         <div class="fenye">
+          <div>共{{ total }}条</div>
           <el-pagination
             :current-page="currentPage"
             :page-size="10"
-            layout="prev, pager, next,total"
+            layout="prev, pager, next"
             :total="total"
             @current-change="handleCurrentChange"
           />
@@ -426,7 +427,7 @@ border:1px solid #EBEEF5;
 .fenye{
   margin-top: 20px;
   display: flex;
-  justify-content: flex-end;
+  justify-content: space-between;
 }
 .titleTj{
   width:100%;
diff --git a/merchant-web-master/src/views/stockControl/inventory/index.vue b/merchant-web-master/src/views/stockControl/inventory/index.vue
index 2b015eb..d96a43e 100644
--- a/merchant-web-master/src/views/stockControl/inventory/index.vue
+++ b/merchant-web-master/src/views/stockControl/inventory/index.vue
@@ -90,7 +90,7 @@
               </template>
             </el-table-column>
           <el-table-column prop="createTime" label="创建时间" width="180" />
-          <el-table-column label="操作" width="200">
+          <el-table-column label="操作" width="200" fixed="right">
             <template slot-scope="scope">
               <div class="btnList">
                 <div class="tableBtn greens" @click="edit(scope.row)">编辑</div>
@@ -141,6 +141,7 @@
       width="70%"
       center
    custom-class="bian_css"
+     top="6vh"
       :close-on-click-modal="false"
       @before-close="closeModal"
       @close="closeModal"
@@ -168,15 +169,15 @@
           </el-radio-group>
         </el-form-item>
         <div class="priceTable">
-          <table>
-            <tr>
-              <th>规格</th>
-              <th>售价</th>
+          <table >
+            <tr >
+              <th >规格</th>
+              <th >售价</th>
               <th v-for="(item,index) in gradeList" :key="index">
                 {{ item }}
               </th>
             </tr>
-            <tr v-for="(item,index) in productData" :key="index">
+            <tr v-for="(item,index) in productData" :key="index" >
               <td>
                 {{ item.value }}
               </td>
@@ -189,11 +190,12 @@
             </tr>
           </table>
         </div>
-        <el-button type="success" class="clearBtn" @click="clearProductMember">清除所有旧会员价</el-button>
+        <el-button style="background-color: #3F9B6A;color: #fff;" class="clearBtn" @click="clearProductMember">清除所有旧会员价</el-button>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="vipPriceVisible = false">取 消</el-button>
-        <el-button type="primary" @click="vipPriceSubmit">确 定</el-button>
+        <el-button @click="vipPriceVisible = false" class="buttonHover"
+        style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取 消</el-button>
+        <el-button style="background-color: #3F9B6A;color: #fff;" @click="vipPriceSubmit">确 定</el-button>
       </span>
     </el-dialog>
     <el-dialog
@@ -221,7 +223,8 @@
       </el-form-item>
     </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="rukuShow = false">取 消</el-button>
+        <el-button @click="rukuShow = false" class="buttonHover"
+        style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取 消</el-button>
         <el-button type="primary" @click="rukuCheck">确 定</el-button>
       </span>
     </el-dialog>
@@ -698,9 +701,9 @@ export default {
         border-top: 1px solid #EBEEF5;
         th{
           padding: 12px 0;
-          background: #EEF3FF;
-          color: #333;
-          border-right: 1px solid #EBEEF5;
+          background: #F2F3F5;
+          color: #0009;
+          border-right: 1px solid #F2F3F5;
         }
         td{
           padding: 12px 0;
@@ -726,4 +729,28 @@ export default {
     margin-top: 20px;
   }
 }
+::v-deep .bian_css{
+      margin:auto;
+       max-height:840px;
+       overflow-y: auto;
+        .el-dialog__body {
+          padding: 0px;
+          background-color: #fff;
+        }
+        .el-dialog__header {
+          background-color: #fff;
+         padding:10px 20px 10px 20px;
+          border-bottom: 1px solid #EFEFEF;
+        }
+        .el-dialog__title {
+         font-size: 14px;
+         color: #000000e6;
+        }
+        .el-date-table td.available:hover{
+          background-color:#3F9B6A;
+        }
+      .el-date-table td.start-date span{
+          background-color:#3F9B6A;
+        }
+      }
 </style>
diff --git a/merchant-web-master/src/views/stockControl/stocksForewarn/index.vue b/merchant-web-master/src/views/stockControl/stocksForewarn/index.vue
index 9d23ca2..c56ebdb 100644
--- a/merchant-web-master/src/views/stockControl/stocksForewarn/index.vue
+++ b/merchant-web-master/src/views/stockControl/stocksForewarn/index.vue
@@ -91,11 +91,12 @@
 
         </el-table>
         <div class="fenye">
+         <div>共{{total}}条</div> 
           <el-pagination
             :current-page="currentPage"
             :page-sizes="[5, 10, 20, 50, 100]"
             :page-size="10"
-            layout="prev, pager, next,total, sizes,  jumper"
+            layout="prev, pager, next"
             :total="total"
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
@@ -125,7 +126,8 @@
             </el-form>
         </div>
         <span slot="footer" class="dialog-footer">
-          <el-button  @click="handleClose"  style="color: #000;border-color:#d5d5d5;">取消</el-button>
+          <el-button  @click="handleClose"  class="buttonHover"
+          style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消</el-button>
       <el-button   @click="kucunSet"  style="background-color: #3F9B6A;color: #fff;">确定</el-button>
 
         </span>
@@ -307,7 +309,7 @@ border:1px solid #EBEEF5;
 .fenye {
   margin-top: 20px;
   display: flex;
-  justify-content: flex-end;
+  justify-content: space-between;
 }
 ::v-deep .setclass{
   .el-dialog__header{
diff --git a/merchant-web-master/src/views/system/shopSys/edit.vue b/merchant-web-master/src/views/system/shopSys/edit.vue
index 0c8f27a..2f8c9b7 100644
--- a/merchant-web-master/src/views/system/shopSys/edit.vue
+++ b/merchant-web-master/src/views/system/shopSys/edit.vue
@@ -24,7 +24,7 @@
             <div class="shopLogon">
               <!-- 上传图片 -->
               <div class="uploadWidth">
-                <el-upload
+                <!-- <el-upload
                   :headers="headers"
                   :action="upload"
                   list-type="picture-card"
@@ -35,7 +35,9 @@
                 </el-upload>
                 <el-dialog :visible.sync="dialogVisible">
                   <img width="100%" :src="dialogImageUrl" alt>
-                </el-dialog>
+                </el-dialog> -->
+                <upimg filePath="bueniss" :value="shopObj.shopLogo" inputtype="coverImage" :limit="1"
+                @changimg="e=>changimg(e,'shopLogo')"></upimg>
               </div>
             </div>
             <div class="common">
@@ -52,7 +54,7 @@
             </div>
             <div class="common">
               <div class="span_1">注册手机号：</div>
-              <el-input v-model="shopObj.phone" placeholder="请输入注册手机号" />
+              <el-input v-model.number="shopObj.phone" placeholder="请输入注册手机号" />
             </div>
           </div>
           <div class="shopDetail_r">
@@ -67,7 +69,7 @@
             </div>
             <div class="common">
               <div class="span_1">联系电话</div>
-              <el-input v-model="shopObj.phone" placeholder="请输入联系电话" />
+              <el-input v-model.number="shopObj.phone" placeholder="请输入联系电话" />
             </div>
           </div>
         </div>
@@ -79,8 +81,11 @@
 <script>
 import { uploadUrl } from '@/utils/request'
 import { getToken } from '@/utils/auth'
+import upimg from "@/components/ImageUpload/index"
 export default {
-  components: {},
+  components: {
+      upimg
+    },
   data() {
     // 这里存放数据
     return {
@@ -100,6 +105,10 @@ export default {
   },
   // 方法集合
   methods: {
+
+    changimg(e, type) {
+      this.shopObj[type] = e
+      },
     handleRemove(file, fileList) {
       console.log(file, fileList)
     },
diff --git a/merchant-web-master/src/views/system/shopSys/index.vue b/merchant-web-master/src/views/system/shopSys/index.vue
index 54bf20a..7e852ce 100644
--- a/merchant-web-master/src/views/system/shopSys/index.vue
+++ b/merchant-web-master/src/views/system/shopSys/index.vue
@@ -3,7 +3,8 @@
     <div class="tab_show">
       <el-form ref="ruleForm" :model="storeDetails" :rules="rules" label-width="100px">
         <div class="h5">
-          <div class="title">店铺信息</div>
+          <!-- <div class="title">店铺信息</div> -->
+          <TitleWithCircle title="店铺信息" style="margin-bottom: 15px;flex: 1;"/>
           <!-- <el-button
             v-if="!disabled1"
             type="text"
@@ -23,7 +24,11 @@
         </div>
         <div class="shop-details">
           <el-form-item label="店铺logo">
-            <el-upload
+              <img :src="$baseURL+storeDetails.shopLogo"   class="shopLogon"  v-if="disabled1" style="width: 100px;height: 100px;"/>
+            <upimg filePath="bueniss" :value="storeDetails.shopLogo" inputtype="coverImage" :limit="1"
+            @changimg="e=>changimg(e,'shopLogo')" v-else></upimg>
+
+            <!-- <el-upload
               :class="[{ 'avatar-uploader': !storeDetails.shopLogo }]"
               :headers="headers"
               :data="dataObj"
@@ -40,7 +45,7 @@
                 height="80"
               >
               <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
+            </el-upload> -->
           </el-form-item>
           <el-form-item label="店铺名称">
             <el-input v-model="storeDetails.shopName" :disabled="disabled1" />
@@ -77,14 +82,16 @@
           </el-form-item>
         </div>
         <div class="h5">
-          <div class="title">店铺认证</div>
+          <!-- <div class="title">店铺认证</div> -->
+          <TitleWithCircle title="店铺认证" style="margin-bottom: 15px;"/>
         </div>
         <div class="shop-details" style="overflow: hidden; line-height: 40px">
           微信支付-商户认证
           <!-- <el-button type="primary" style="float:right" @click="approve">立即认证</el-button> -->
         </div>
         <div class="h5">
-          <div class="title">退货地址</div>
+          <!-- <div class="title">退货地址</div> -->
+          <TitleWithCircle title="退货地址" style="margin-bottom: 15px;"/>
         </div>
         <div class="shop-details">
           <el-form-item label="地址">
@@ -123,8 +130,14 @@
 import { shopSysGetById, shopSysUpdate } from '@/api/shopSys';
 import { uploadUrl } from '@/utils/request';
 import { getToken } from '@/utils/auth';
+import upimg from "@/components/ImageUpload/index"
+import TitleWithCircle from '@/components/top/index';
 const PhoneRule = /^1(3\d|4[5-9]|5[0-35-9]|6[567]|7[0-8]|8\d|9[0-35-9])\d{8}$/
 export default {
+  components: {
+      upimg,
+      TitleWithCircle
+    },
   data() {
     return {
       form: {
@@ -180,6 +193,9 @@ export default {
     this.privacyTime = localStorage.getItem('privacyTime');
   },
   methods: {
+    changimg(e, type) {
+      this.storeDetails[type] = e
+      },
     focusReturnPhoneInput() {
       // 处理后端没有返回shopReturn字段
       if (!this.storeDetails.shopReturn) {