Página Principal Explorar Ajuda
Registe-se Iniciar Sessão
lianghanqiang
/
CY-SHOP-UI
1
0
Fork 0
Ficheiros Problemas 0 Pull Requests 0 Wiki
Ver Fonte

初始化仓库

lianghanqiang há 4 anos atrás
pai
48c0dcb69b
commit
5587d43ea5
47 ficheiros alterados com 154 adições e 114 exclusões
Visão Dividida Mostrar Estatísticas Diff
  1. 3 0
      .idea/misc.xml
  2. 1 2
      buyer/config/index.js
  3. 2 2
      buyer/index.html
  4. BIN
      buyer/src/assets/images/logo1.png
  5. 4 3
      buyer/src/components/Search.vue
  6. 4 1
      buyer/src/components/footer/Footer.vue
  7. 1 1
      buyer/src/components/indexDecorate/modelList/carousel.vue
  8. 14 14
      buyer/src/config/index.js
  9. 10 4
      buyer/src/main.js
  10. 3 1
      buyer/src/pages/Cart.vue
  11. 1 1
      buyer/src/pages/Index.vue
  12. 8 8
      buyer/src/pages/Login.vue
  13. 5 5
      buyer/src/pages/SignUp.vue
  14. 17 17
      buyer/src/pages/forgetPassword.vue
  15. 2 1
      buyer/src/pages/payment/Pay.vue
  16. 24 0
      buyer/src/pages/payment/PayMent.vue
  17. 2 2
      buyer/src/pages/payment/thirdPay.vue
  18. 3 3
      buyer/src/router/index.js
  19. BIN
      buyer/static/logo.ico
  20. BIN
      buyer/static/logo.png
  21. 2 2
      manager/public/index.html
  22. BIN
      manager/public/logo.ico
  23. BIN
      manager/public/logo.png
  24. BIN
      manager/src/assets/logo.png
  25. BIN
      manager/src/assets/logo1.png
  26. 14 14
      manager/src/config/index.js
  27. 2 2
      manager/src/libs/util.js
  28. 1 1
      manager/src/router/router.js
  29. 0 1
      manager/src/views/Main.vue
  30. 1 1
      manager/src/views/lili-floor-renovation/modelList/carousel.vue
  31. 1 1
      manager/src/views/login.vue
  32. 1 1
      manager/src/views/main-components/footer.vue
  33. 2 2
      manager/src/views/main-components/header.vue
  34. 1 0
      manager/src/views/sys/setting-manage/pay/PAYMENT_SUPPORT.vue
  35. 2 0
      manager/src/views/sys/setting-manage/settingManage.vue
  36. 1 0
      manager/vue.config.js
  37. 1 1
      seller/public/index.html
  38. BIN
      seller/public/logo.ico
  39. BIN
      seller/public/logo.png
  40. BIN
      seller/src/assets/logo.png
  41. 12 13
      seller/src/config/index.js
  42. 2 2
      seller/src/libs/util.js
  43. 1 1
      seller/src/router/index.js
  44. 1 1
      seller/src/views/Main.vue
  45. 1 1
      seller/src/views/login.vue
  46. 1 1
      seller/src/views/main-components/header.vue
  47. 3 4
      seller/src/views/promotion/fullCut/fullCut.vue

+ 3 - 0
.idea/misc.xml
Ver Ficheiro 

@@ -3,4 +3,7 @@
 
   <component name="JavaScriptSettings">
 
     <option name="languageLevel" value="ES6" />
 
   </component>
 
+  <component name="WebPackConfiguration">
 
+    <option name="mode" value="DISABLED" />
 
+  </component>
 
 </project>

+ 1 - 2
buyer/config/index.js
Ver Ficheiro 

@@ -6,7 +6,6 @@ const path = require('path')
 
 // const api = 'http://www.baidu.com'
 
 module.exports = {
 
   dev: {
 
-
 
     // Paths
 
     assetsSubDirectory: 'static',
 
     assetsPublicPath: '/',
 
@@ -21,7 +20,7 @@ module.exports = {
 
     },
 
 
     // Various Dev Server settings
 
-    host: '0.0.0.0', // can be overwritten by process.env.HOST
 
+    host: '192.168.1.48', // can be overwritten by process.env.HOST
 
     port: 10000, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
 
     autoOpenBrowser: false,
 
     errorOverlay: true,

+ 2 - 2
buyer/index.html
Ver Ficheiro 

@@ -3,9 +3,9 @@
 
   <head>
 
     <meta charset="utf-8">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
-    <link rel="icon" href="./static/logo.ico" type="image/x-icon">
 
+    <link rel="icon" href="./static/logo.png" type="image/x-icon">
 
     <script src="https://yzf.qq.com/xv/web/static/chat_sdk/yzf_chat.min.js"></script>
 
-    <title>LILI</title>
 
+    <title>南粤商城</title>
 
   </head>
 
   <body>
 
     <div id="app"></div>

BIN
buyer/src/assets/images/logo1.png
Ver Ficheiro


+ 4 - 3
buyer/src/components/Search.vue
Ver Ficheiro 

@@ -128,9 +128,10 @@ export default {
 
 }
 
 .logo-img {
 
   position: absolute;
 
-  left: -360px;
 
-  top: -9px;
 
-  width: 150px;
 
+  left: -300px;
 
+  top: -20px;
 
+  width: 130px;
 
+  height: 90px;
 
   cursor: pointer;
 
 }
 
 .store-search{

+ 4 - 1
buyer/src/components/footer/Footer.vue
Ver Ficheiro 

@@ -40,7 +40,10 @@
 
         </div>
 
         <div class="clearfix"></div>
 
         <div class="copyright">
 
-          <p>Copyright © {{year}} LILI</p>
 
+          <p>全国咨询热线: 4009020699  违法和不良信息举报电话: 020-34152794   举报邮箱: defu@nanyue6688.com</p>
 
+          <p>Copyright © {{year}} 广东南粤药业有限公司 <a href="http://www.nanyue6688.com" style="font-size: 14px;color: #646464;text-decoration: underline">www.nanyue6688.com</a>
 
+            备案号: 粤ICP备19084728号-1
 
+          </p>
 
         </div>
 
       </div>
 
     </footer>

+ 1 - 1
buyer/src/components/indexDecorate/modelList/carousel.vue
Ver Ficheiro 

@@ -23,7 +23,7 @@
 
         <div class="person-msg">
 
           <img :src="userInfo.face" v-if="userInfo.face" alt />
 
           <Avatar icon="ios-person" class="mb_10" v-else size="80" />
 
-          <div>Hi，{{ userInfo.nickName || "欢迎来到LiLi Shop" | secrecyMobile }}</div>
 
+          <div>Hi，{{ userInfo.nickName || "欢迎来到 南粤商城" | secrecyMobile }}</div>
 
           <div v-if="userInfo.id">
 
             <Button type="error" shape="circle" @click="$router.push('home')">会员中心</Button>
 
           </div>

+ 14 - 14
buyer/src/config/index.js
Ver Ficheiro 

@@ -2,7 +2,7 @@ export default {
 
   /**
 
    * @description 配置显示在浏览器标签的title
 
    */
 
-  title: 'Lili电商',
 
+  title: '南粤电商',
 
   /**
 
    * @description token在Cookie中存储的天数，默认1天
 
    */
 
@@ -17,21 +17,21 @@ export default {
 
    * @description api请求基础路径
 
    */
 
   api_dev: {
 
-    // common: 'http://192.168.0.106:8890',
 
-    // buyer: 'http://192.168.0.106:8888',
 
-    // seller: 'http://192.168.0.106:8889',
 
-    // manager: 'http://192.168.0.106:8887'
 
-
 
-    common: 'https://common-api.pickmall.cn',
 
-    buyer: 'https://buyer-api.pickmall.cn',
 
-    seller: 'https://store-api.pickmall.cn',
 
-    manager: 'https://admin-api.pickmall.cn'
 
+    common: 'http://localhost:8890',
 
+    buyer: 'http://localhost:8888',
 
+    seller: 'http://localhost:8889',
 
+    manager: 'http://localhost:8887'
 
+    //
 
+    // common: 'http://8.129.99.119/common-api',
 
+    // buyer: 'http://8.129.99.119/buyer-api',
 
+    // seller: 'http://8.129.99.119/seller-api',
 
+    // manager: 'http://8.129.99.119/manager-api'
 
   },
 
   api_prod: {
 
-    common: 'https://common-api.pickmall.cn',
 
-    buyer: 'https://buyer-api.pickmall.cn',
 
-    seller: 'https://store-api.pickmall.cn',
 
-    manager: 'https://admin-api.pickmall.cn'
 
+    common: 'http://8.129.99.119/common-api',
 
+    buyer: 'http://8.129.99.119/buyer-api',
 
+    seller: 'http://8.129.99.119/seller-api',
 
+    manager: 'http://8.129.99.119/manager-api'
 
   },
 
   /**
 
    *  @description api请求基础路径前缀

+ 10 - 4
buyer/src/main.js
Ver Ficheiro 

@@ -22,7 +22,7 @@ Object.keys(filters).forEach(key => {
 
 
 router.beforeEach((to, from, next) => {
 
   ViewUI.LoadingBar.start();
 
-  window.document.title = to.meta.title === undefined ? 'lili shop' : to.meta.title
 
+  window.document.title = to.meta.title === undefined ? '南粤商城' : to.meta.title
 
   next();
 
 });
 
 
@@ -38,9 +38,15 @@ Vue.prototype.linkTo = function (url) {
 
   }
 
 }
 
 // 联系客服
 
-Vue.prototype.connectCs = function (sign = '37ef9b97807d03c6741298ed4eb5b536d2d238e08a3c00fb01fe48f03a569974c99ad767e72c04b3165ef29aca2c488b505fe4ca') { 
-  const url = 'https://yzf.qq.com/xv/web/static/chat/index.html?sign=' + sign
 
-  window.open(url, '_blank')
 
+// Vue.prototype.connectCs = function (sign = '37ef9b97807d03c6741298ed4eb5b536d2d238e08a3c00fb01fe48f03a569974c99ad767e72c04b3165ef29aca2c488b505fe4ca') {
 
+//   const url = 'https://yzf.qq.com/xv/web/static/chat/index.html?sign='+ sign
 
+//   window.open(url, '_blank')
 
+// }
 
+Vue.prototype.connectCs = function () {
 
+  this.$Modal.info({
 
+    title: '联系客服',
 
+    content: '<p>客服电话：4009020699</p><p>服务时间：9:00-18:00</p>'
 
+  });
 
 }
 
 Vue.prototype.Cookies = storage
 
 /* eslint-disable no-new */

+ 3 - 1
buyer/src/pages/Cart.vue
Ver Ficheiro 

@@ -4,7 +4,9 @@
 
     <!-- LOGO 搜索 -->
 
     <div class="width_1200 logo">
 
       <div>
 
-        <router-link to="/"><img :src="logoImg" alt="lili shop" title="lilishop" /></router-link>
 
+        <router-link to="/">
 
+          <img style="width: 100px;height: 65px" :src="logoImg" alt="南粤商城" title="南粤商城" />
 
+        </router-link>
 
         <div>
 
           购物车(<span>{{ goodsTotal }}</span>)
 
         </div>

+ 1 - 1
buyer/src/pages/Index.vue
Ver Ficheiro 

@@ -5,7 +5,7 @@
 
     <hover-search class="hover-search" :class="{show: topSearchShow}"></hover-search>
 
 
     <!-- 顶部广告 -->
 
-    <FixedTopPage :data="topAdvert"></FixedTopPage>
 
+<!--    <FixedTopPage :data="topAdvert"></FixedTopPage>-->
 
     <!-- 头部 包括登录，我的订单等 -->
 
     <BaseHeader></BaseHeader>
 
     <!-- 搜索框、logo -->

+ 8 - 8
buyer/src/pages/Login.vue
Ver Ficheiro 

@@ -7,7 +7,7 @@
 
           :src="logoImg"
 
           @click="$router.push('/')"
 
         />
 
-        <div>欢迎登录</div>
 
+        <div style="margin-left: 50px"> 欢迎登录</div>
 
       </div>
 
     </div>
 
     <!-- 登录主体 包含轮播图 登录模块 -->
 
@@ -17,7 +17,7 @@
 
         <CarouselItem>
 
           <div class="demo-carousel" @click='$refs.verify.show = false'>
 
             <img
 
-              src="https://wanmi-b2b.oss-cn-shanghai.aliyuncs.com/201811141632252680"
 
+              src="https://gxsz-bucket-01.obs.cn-south-1.myhuaweicloud.com/poster.png"
 
             />
 
           </div>
 
         </CarouselItem>
 
@@ -113,10 +113,10 @@
 
         <div class="regist">
 
           <span @click="$router.push('forgetPassword')">忘记密码</span>
 
         </div>
 
-        <div class="other-login">
 
-          <Icon custom="icomoon icon-qq" color="" class="icon-hover" @click="handleWebLogin('QQ')"/>
 
-          <Icon custom="icomoon icon-wechat" color="" class="icon-hover"  @click="handleWebLogin('WECHAT_PC')"/>
 
-        </div>
 
+<!--        <div class="other-login">-->
 
+<!--          <Icon custom="icomoon icon-qq" color="" class="icon-hover" @click="handleWebLogin('QQ')"/>-->
 
+<!--          <Icon custom="icomoon icon-wechat" color="" class="icon-hover"  @click="handleWebLogin('WECHAT_PC')"/>-->
 
+<!--        </div>-->
 
       </div>
 
       <!-- 拼图验证码 -->
 
       <verify
 
@@ -134,7 +134,7 @@
 
       </Row>
 
       <Row type="flex" justify="center" class="copyright">
 
         Copyright © 2021 - Present
 
-        <a href="https://pickmall.cn" target="_blank" style="margin: 0 5px">lili-shop</a>
 
+        <a href="https://nanyue6688" target="_blank" style="margin: 0 5px">南粤商城</a>
 
         版权所有
 
       </Row>
 
     </div>
 
@@ -372,7 +372,7 @@ export default {
 
     display: flex;
 
     align-items: center;
 
     img {
 
-      width: 150px;
 
+      width: 80px;
 
       cursor: pointer;
 
     }
 
     div {

+ 5 - 5
buyer/src/pages/SignUp.vue
Ver Ficheiro 

@@ -3,11 +3,11 @@
 
     <div style="height:50px;"></div>
 
     <div class="logo-box">
 
       <img
 
-        width="150"
 
+        width="80"
 
         :src="logoImg"
 
         @click="$router.push('/')"
 
       />
 
-      <div>注册</div>
 
+      <div style="margin-left: 50px">注册</div>
 
     </div>
 
     <div class="login-container">
 
         <!-- 注册 -->
 
@@ -70,7 +70,7 @@
 
               >注册</Button
 
             >
 
           </FormItem>
 
-          <FormItem><span class="color999 ml_20">点击注册，表示您同意《<router-link to="/article?id=1371992704333905920" target="_blank">商城用户协议</router-link>》</span></FormItem>
 
+          <FormItem><span class="color999 ml_20">，表示您同意《<router-link to="/article?id=1371992704333905920" target="_blank">商城用户协议</router-link>》</span></FormItem>
 
         </Form>
 
         <!-- 拼图验证码 -->
 
         <Verify
 
@@ -89,7 +89,7 @@
 
       </Row>
 
       <Row type="flex" justify="center" class="copyright">
 
         Copyright © 2021 - Present
 
-        <a href="https://pickmall.cn" target="_blank" style="margin: 0 5px">lili-shop</a>
 
+        <a href="http://nanyue6688.com" target="_blank" style="margin: 0 5px">南粤商城</a>
 
         版权所有
 
       </Row>
 
     </div>
 
@@ -223,7 +223,7 @@ export default {
 
   display: flex;
 
   align-items: center;
 
   img {
 
-    width: 150px;
 
+    width: 80px;
 
     cursor: pointer;
 
   }
 
   div {

+ 17 - 17
buyer/src/pages/forgetPassword.vue
Ver Ficheiro 

@@ -4,10 +4,10 @@
 
     <!-- 顶部logo -->
 
     <div class="logo-box">
 
       <img
 
-        :src="logoImg" width='150'
 
+        :src="logoImg" width='80'
 
         @click="$router.push('/')"
 
       />
 
-      <div>修改密码</div>
 
+      <div style="margin-left: 80px">修改密码</div>
 
     </div>
 
     <div class="login-container">
 
         <!-- 验证手机号 -->
 
@@ -90,20 +90,20 @@
 
         ></Verify>
 
         <div class="login-btn"><a @click="$router.push('login')">前往登录</a></div>
 
     </div>
 
-    <div class="foot">
 
-      <Row type="flex" justify="space-around" class="help">
 
-        <a class="item" href="https://pickmall.cn/" target="_blank">帮助</a>
 
-        <a class="item" href="https://pickmall.cn/" target="_blank">隐私</a>
 
-        <a class="item" href="https://pickmall.cn/" target="_blank">条款</a>
 
-      </Row>
 
-      <Row type="flex" justify="center" class="copyright">
 
-        Copyright © {{year}} - Present
 
-        <a href="https://pickmall.cn/" target="_blank" style="margin: 0 5px"
 
-          >lili-shop</a
 
-        >
 
-        版权所有
 
-      </Row>
 
-    </div>
 
+<!--    <div class="foot">-->
 
+<!--      <Row type="flex" justify="space-around" class="help">-->
 
+<!--        <a class="item" href="https://pickmall.cn/" target="_blank">帮助</a>-->
 
+<!--        <a class="item" href="https://pickmall.cn/" target="_blank">隐私</a>-->
 
+<!--        <a class="item" href="https://pickmall.cn/" target="_blank">条款</a>-->
 
+<!--      </Row>-->
 
+<!--      <Row type="flex" justify="center" class="copyright">-->
 
+<!--        Copyright © {{year}} - Present-->
 
+<!--        <a href="https://pickmall.cn/" target="_blank" style="margin: 0 5px"-->
 
+<!--          >南粤商城</a-->
 
+<!--        >-->
 
+<!--        版权所有-->
 
+<!--      </Row>-->
 
+<!--    </div>-->
 
   </div>
 
 </template>
 
 
@@ -261,7 +261,7 @@ export default {
 
   display: flex;
 
   align-items: center;
 
   img {
 
-    width: 150px;
 
+    width: 80px;
 
     cursor: pointer;
 
   }
 
   div {

+ 2 - 1
buyer/src/pages/payment/Pay.vue
Ver Ficheiro 

@@ -5,7 +5,8 @@
 
     <div class="width_1200 logo">
 
       <div>
 
         <router-link to="/"
 
-          ><img :src="logoImg" alt="lili shop" title="lilishop"
 
+          >
 
+          <img style="width: 100px;height: 65px" :src="logoImg" alt="南粤商城" title="南粤商城" />
 
         /></router-link>
 
         <div>结算页</div>
 
       </div>

+ 24 - 0
buyer/src/pages/payment/PayMent.vue
Ver Ficheiro 

@@ -34,6 +34,12 @@
 
           alt="">
 
         <span>微信</span>
 
       </div>
 
+      <div v-if="support.includes('YEEPAY')"  class="-box-item" @click="handlePay('YEEPAY')">
 
+        <img style="width: 200px;"
 
+          src="https://www.yeepay.com/static/images/w-logo.png"
 
+          alt="">
 
+        <span>易宝</span>
 
+      </div>
 
       <div v-if="support.includes('WALLET') && $route.query.orderType !== 'RECHARGE'" class="-box-item" @click="handlePay('WALLET')">
 
         <Icon custom="icomoon icon-wallet" size="60"/>
 
         <span>余额支付</span>
 
@@ -108,6 +114,24 @@ export default {
 
             })
 
           }
 
         });
 
+      };
 
+      if (way === 'YEEPAY') {
 
+        this.$Modal.confirm({
 
+          title: '支付确认',
 
+          content: '<p>确认使用易宝支付吗？</p>',
 
+          onOk: () => {
 
+            params.paymentClient = 'GATEWAY'
 
+            pay(params).then(res => {
 
+              if (res.success) {
 
+                location.href = res.result.payUrl;
 
+                // this.$Message.warning(res.message)
 
+                // this.$router.push('/payDone');
 
+              } else {
 
+                this.$Message.warning(res.message)
 
+              }
 
+            })
 
+          }
 
+        });
 
       } else {
 
         this.$router.push({path: '/qrpay', query: params});
 
       }

+ 2 - 2
buyer/src/pages/payment/thirdPay.vue
Ver Ficheiro 

@@ -48,10 +48,10 @@ export default {
 
   methods: {
 
     handlePay () {
 
       const params = this.$route.query;
 
-
 
+      console.log(params, 123456);
 
       pay(params).then(res => {
 
         if (res.success) {
 
-          this.qrcode = res.result;
 
+          this.qrcode = res.result.prePayTn;
 
           this.num = 0;
 
           this.interval = setInterval(this.callback, 5000);
 
         } else {

+ 3 - 3
buyer/src/router/index.js
Ver Ficheiro 

@@ -85,7 +85,7 @@ export default new Router({
 
     name: 'Login',
 
     component: Login,
 
     meta: {
 
-      title: 'LiLi 登录'
 
+      title: '南粤 登录'
 
     }
 
   },
 
   {
 
@@ -93,7 +93,7 @@ export default new Router({
 
     name: 'SignUp',
 
     component: SignUp,
 
     meta: {
 
-      title: 'LiLi 注册'
 
+      title: '南粤 注册'
 
     }
 
   },
 
   {
 
@@ -101,7 +101,7 @@ export default new Router({
 
     name: 'forgetPassword',
 
     component: ForgetPassword,
 
     meta: {
 
-      title: 'LiLi 忘记密码'
 
+      title: '南粤 忘记密码'
 
     }
 
   },
 
   {

BIN
buyer/static/logo.ico
Ver Ficheiro


BIN
buyer/static/logo.png
Ver Ficheiro


+ 2 - 2
manager/public/index.html
Ver Ficheiro 

@@ -5,8 +5,8 @@
 
   <meta charset="utf-8">
 
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
   <!-- <meta name="viewport" content="width=device-width,initial-scale=1.0"> -->
 
-  <link rel="icon" href="./logo.ico" type="image/x-icon">
 
-  <title>lili admin</title>
 
+  <link rel="icon" href="./logo.png" type="image/x-icon">
 
+  <title>南粤商城</title>
 
   <meta name="keywords"
 
     content="keywords">
 
   <meta name="description"

BIN
manager/public/logo.ico
Ver Ficheiro


BIN
manager/public/logo.png
Ver Ficheiro


BIN
manager/src/assets/logo.png
Ver Ficheiro


BIN
manager/src/assets/logo1.png
Ver Ficheiro


+ 14 - 14
manager/src/config/index.js
Ver Ficheiro 

@@ -2,7 +2,7 @@ export default {
 
   /**
 
    * @description 配置显示在浏览器标签的title
 
    */
 
-  title: "Lili电商",
 
+  title: "南粤商城",
 
   /**
 
    * @description token在Cookie中存储的天数，默认1天
 
    */
 
@@ -17,20 +17,20 @@ export default {
 
    * @description api请求基础路径
 
    */
 
   api_dev: {
 
-    common: "https://common-api.pickmall.cn",
 
-    buyer: "https://buyer-api.pickmall.cn",
 
-    seller: "https://store-api.pickmall.cn",
 
-    manager: "https://admin-api.pickmall.cn"
 
-    // common: 'http://192.168.0.106:8890',
 
-    // buyer: 'http://192.168.0.106:8888',
 
-    // seller: 'http://192.168.0.106:8889',
 
-    // manager: 'http://192.168.0.106:8887'
 
+    // common: 'http://8.129.99.119/common-api',
 
+    // buyer: 'http://8.129.99.119/buyer-api',
 
+    // seller: 'http://8.129.99.119/seller-api',
 
+    // manager: 'http://8.129.99.119/manager-api'
 
+    common: 'http://192.168.1.48:8890',
 
+    buyer: 'http://192.168.1.48:8888',
 
+    seller: 'http://192.168.1.48:8889',
 
+    manager: 'http://192.168.1.48:8887'
 
   },
 
   api_prod: {
 
-    common: "https://common-api.pickmall.cn",
 
-    buyer: "https://buyer-api.pickmall.cn",
 
-    seller: "https://store-api.pickmall.cn",
 
-    manager: "https://admin-api.pickmall.cn"
 
+    common: 'http://8.129.99.119/common-api',
 
+    buyer: 'http://8.129.99.119/buyer-api',
 
+    seller: 'http://8.129.99.119/seller-api',
 
+    manager: 'http://8.129.99.119/manager-api'
 
   },
 
   /**
 
    *  @description api请求基础路径前缀
 
@@ -41,7 +41,7 @@ export default {
 
    */
 
   plugin: {
 
     "error-store": {
 
-      showInHeader: true, // 设为false后不会在顶部显示错误日志徽标
 
+      showInHeader: false, // 设为false后不会在顶部显示错误日志徽标
 
       developmentOff: true // 设为true后在开发环境不会收集错误信息，方便开发中排查错误
 
     }
 
   }

+ 2 - 2
manager/src/libs/util.js
Ver Ficheiro 

@@ -9,7 +9,7 @@ let util = {
 
 };
 
 
 util.title = function (title) {
 
-    title = title || 'lili 运营后台';
 
+    title = title || '南粤商城 运营后台';
 
     window.document.title = title;
 
 };
 
 
@@ -458,7 +458,7 @@ util.initRouterNode = function (routers, data) {  // data为所有子菜单数
 
         let meta = {};
 
         // 给页面添加权限、标题、第三方网页链接
 
         meta.permTypes = menu.permTypes ? menu.permTypes : null;
 
-        meta.title = menu.title ? menu.title + " - lilishop 运营后台" : null;
 
+        meta.title = menu.title ? menu.title + " - 南粤商城 运营后台" : null;
 
         meta.url = menu.url ? menu.url : null;
 
         menu.meta = meta;

+ 1 - 1
manager/src/router/router.js
Ver Ficheiro 

@@ -5,7 +5,7 @@ export const loginRouter = {
 
   path: "/login",
 
   name: "login",
 
   meta: {
 
-    title: "登录 - lili运营后台"
 
+    title: "登录 - 南粤商城运营后台"
 
   },
 
   component: () => import("@/views/login.vue")
 
 };

+ 0 - 1
manager/src/views/Main.vue
Ver Ficheiro 

@@ -19,7 +19,6 @@
 
           <message-tip v-if="tipsMessage" :res="tipsMessage"></message-tip>
 
           <!-- 用户头像 -->
 
           <div class="user-dropdown-menu-con">
 
-
 
             <Row type="flex" justify="end" align="middle" class="user-dropdown-innercon">
 
               <Dropdown transfer trigger="hover" @on-click="handleClickUserDropdown">
 
                 <div class="dropList">

+ 1 - 1
manager/src/views/lili-floor-renovation/modelList/carousel.vue
Ver Ficheiro 

@@ -21,7 +21,7 @@
 
       <div class="nav-right">
 
         <div class="person-msg">
 
           <img src="../../../assets/play.png" alt />
 
-          <div>Hi，欢迎来到LiLi Shop</div>
 
+          <div>Hi，欢迎来到南粤商城</div>
 
           <div>
 
             <Button type="error" shape="circle">请登录</Button> &nbsp;
 
             <Button size="small" shape="circle">我要开店</Button>

+ 1 - 1
manager/src/views/login.vue
Ver Ficheiro 

@@ -27,7 +27,7 @@
 
       <div v-if="socialLogining">
 
         <RectLoading />
 
       </div>
 
-      <Footer />
 
+<!--      <Footer />-->
 
       </Col>
 
       <!-- <LangSwitch /> -->
 
     </Row>

+ 1 - 1
manager/src/views/main-components/footer.vue
Ver Ficheiro 

@@ -11,7 +11,7 @@
 
         href="https://pickmall.cn/"
 
         target="_blank"
 
         style="margin:0 5px;"
 
-      >lili-shop</a> {{ $t('rights') }}
 
+      >南粤商城</a> {{ $t('rights') }}
 
     </Row>
 
   </div>
 
 </template>

+ 2 - 2
manager/src/views/main-components/header.vue
Ver Ficheiro 

@@ -1,7 +1,7 @@
 
 <template>
 
   <div>
 
     <Row class="header">
 
-      <img src="../../assets/logo.png" class="logo" width="220px">
 
+      <img src="../../assets/logo.png" class="logo" width="200px">
 
     </Row>
 
   </div>
 
 </template>
 
@@ -20,7 +20,7 @@ export default {
 
   justify-content: center !important;
 
 }
 
 .logo {
 
-  width: 440px;
 
+  //width: 400px;
 
   height: 158px;
 
 }
 
 </style>

+ 1 - 0
manager/src/views/sys/setting-manage/pay/PAYMENT_SUPPORT.vue
Ver Ficheiro 

@@ -71,6 +71,7 @@ export default {
 
         ALIPAY: "支付宝支付",
 
         WECHAT: "微信支付",
 
         WALLET: "余额支付",
 
+        YEEPAY: "易宝支付"
 
       },
 
       supportForm: "", // 支持的支付方式
 
     };

+ 2 - 0
manager/src/views/sys/setting-manage/settingManage.vue
Ver Ficheiro 

@@ -75,6 +75,8 @@ export default {
 
         {type: "ALIPAY_PAYMENT", name: "支付宝支付设置"},
 
         //微信支付设置
 
         {type: "WECHAT_PAYMENT", name: "微信支付设置"},
 
+        //易宝支付设置
 
+        {type: "YEEPAY_PAYMENT", name: "易宝支付设置"},
 
       ],
 
       tabWay: [], // tab数据
 
     };

+ 1 - 0
manager/vue.config.js
Ver Ficheiro 

@@ -6,6 +6,7 @@ const resolve = dir => {
 
 };
 
 
 module.exports = {
 
+  publicPath: "./",
 
   css: {
 
     loaderOptions: {
 
       // 向 CSS 相关的 loader 传递选项

+ 1 - 1
seller/public/index.html
Ver Ficheiro 

@@ -5,7 +5,7 @@
 
   <meta charset="utf-8">
 
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
   <!-- <meta name="viewport" content="width=device-width,initial-scale=1.0"> -->
 
-  <link rel="icon" href="./logo.ico" type="image/x-icon">
 
+  <link rel="icon" href="./logo.png" type="image/x-icon">
 
   <title>lili store</title>
 
   <meta name="keywords"
 
     content="keywords">

BIN
seller/public/logo.ico
Ver Ficheiro


BIN
seller/public/logo.png
Ver Ficheiro


BIN
seller/src/assets/logo.png
Ver Ficheiro


+ 12 - 13
seller/src/config/index.js
Ver Ficheiro 

@@ -18,21 +18,20 @@ export default {
 
    * @description api请求基础路径
 
    */
 
   api_dev: {
 
-    common: 'https://common-api.pickmall.cn',
 
-    buyer: 'https://buyer-api.pickmall.cn',
 
-    seller: 'https://store-api.pickmall.cn',
 
-    manager: 'https://admin-api.pickmall.cn',
 
-    // common: 'http://192.168.0.106:8890',
 
-    // buyer: 'http://192.168.0.106:8888',
 
-    // seller: 'http://192.168.0.106:8889',
 
-    // manager: 'http://192.168.0.106:8887'
 
-
 
+    // common: 'https://common-api.pickmall.cn',
 
+    // buyer: 'https://buyer-api.pickmall.cn',
 
+    // seller: 'https://store-api.pickmall.cn',
 
+    // manager: 'https://admin-api.pickmall.cn',
 
+    common: 'http://192.168.1.48:8890',
 
+    buyer: 'http://192.168.1.48:8888',
 
+    seller: 'http://192.168.1.48:8889',
 
+    manager: 'http://192.168.1.48:8887'
 
   },
 
   api_prod: {
 
-    common: 'https://common-api.pickmall.cn',
 
-    buyer: 'https://buyer-api.pickmall.cn',
 
-    seller: 'https://store-api.pickmall.cn',
 
-    manager: 'https://admin-api.pickmall.cn'
 
+    common: 'http://8.129.99.119/common-api',
 
+    buyer: 'http://8.129.99.119/buyer-api',
 
+    seller: 'http://8.129.99.119/seller-api',
 
+    manager: 'http://8.129.99.119/manager-api'
 
   },
 
   /**
 
    *  @description api请求基础路径前缀

+ 2 - 2
seller/src/libs/util.js
Ver Ficheiro 

@@ -10,7 +10,7 @@ let util = {
 
 };
 
 
 util.title = function (title) {
 
-    title = title || 'lili 商家后台';
 
+    title = title || '南粤商城 商家后台';
 
     window.document.title = title;
 
 };
 
 
@@ -448,7 +448,7 @@ util.initRouterNode = function (routers, data) {  // data为所有子菜单数
 
         let meta = {};
 
         // 给页面添加权限、标题、第三方网页链接
 
         meta.permTypes = menu.permTypes ? menu.permTypes : null;
 
-        meta.title = menu.title ? menu.title + " - lilishop商家后台" : null;
 
+        meta.title = menu.title ? menu.title + " - 南粤商城 商家后台" : null;
 
         meta.url = menu.url ? menu.url : null;
 
         menu.meta = meta;

+ 1 - 1
seller/src/router/index.js
Ver Ficheiro 

@@ -9,7 +9,7 @@ Vue.use(VueRouter);
 
 
 // 路由配置
 
 const RouterConfig = {
 
-  mode: 'history',
 
+  mode: 'Hash',
 
   routes: routers
 
 };

+ 1 - 1
seller/src/views/Main.vue
Ver Ficheiro 

@@ -24,7 +24,7 @@
 
                   <Avatar :src="userInfo.storeLogo" style="background: #fff;margin-left: 10px;"></Avatar>
 
                 </div>
 
                 <DropdownMenu slot="list">
 
-                  <!-- <DropdownItem name="ownSpace">{{ $t('userCenter') }}</DropdownItem> -->
 
+                   <DropdownItem name="ownSpace">{{ $t('userCenter') }}</DropdownItem>
 
                   <DropdownItem name="changePass">{{ $t('changePass') }}</DropdownItem>
 
                   <DropdownItem name="loginOut" divided>{{ $t('logout') }}</DropdownItem>
 
                 </DropdownMenu>

+ 1 - 1
seller/src/views/login.vue
Ver Ficheiro 

@@ -21,7 +21,7 @@
 
         </Row>
 
 
       </Row>
 
-      <Footer />
 
+<!--      <Footer />-->
 
       <!-- 拼图验证码 -->
 
       <verify ref="verify" class="verify-con" verifyType="LOGIN" @change="verifyChange"></verify>
 
       </Col>

+ 1 - 1
seller/src/views/main-components/header.vue
Ver Ficheiro 

@@ -20,7 +20,7 @@ export default {
 
   justify-content: center !important;
 
 }
 
 .logo {
 
-  width: 440px;
 
+  //width: 440px;
 
   height: 158px;
 
 }
 
 </style>

+ 3 - 4
seller/src/views/promotion/fullCut/fullCut.vue
Ver Ficheiro 

@@ -73,11 +73,10 @@
 
               v-if="row.promotionStatus == 'NEW'"
 
               size="small"
 
               @click="edit(row)"
 
-              >编辑</Button
 
-            >&nbsp;
 
+              >编辑</Button>
 
             <Button type="success" v-else size="small" @click="edit(row)"
 
-              >查看</Button
 
-            >&nbsp;
 
+              >查看</Button>
 
+            &nbsp;
 
             <Button
 
               type="error"
 
               :disabled="row.promotionStatus == 'START'"