Bladeren bron

feat ui 修改了登录的逻辑和项目名称

GaoRunQi 5 maanden geleden
bovenliggende
commit
bef43c3028
32 gewijzigde bestanden met toevoegingen van 56 en 55 verwijderingen
  1. 4 3
      yudao-ui-admin-vue2/.env.dev
  2. 2 2
      yudao-ui-admin-vue2/.env.front
  3. 4 4
      yudao-ui-admin-vue2/.env.prod
  4. 2 2
      yudao-ui-admin-vue2/.env.stage
  5. 2 2
      yudao-ui-admin-vue2/.env.static
  6. BIN
      yudao-ui-admin-vue2/dist.rar
  7. 1 1
      yudao-ui-admin-vue2/package.json
  8. 2 2
      yudao-ui-admin-vue2/src/components/Editor/index.vue
  9. 1 1
      yudao-ui-admin-vue2/src/components/FileUpload/index.vue
  10. 2 2
      yudao-ui-admin-vue2/src/components/ImageUpload/index.vue
  11. 1 1
      yudao-ui-admin-vue2/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue
  12. 2 2
      yudao-ui-admin-vue2/src/components/parser/Parser.vue
  13. 1 1
      yudao-ui-admin-vue2/src/layout/components/Sidebar/Logo.vue
  14. 1 1
      yudao-ui-admin-vue2/src/utils/constants.js
  15. 1 1
      yudao-ui-admin-vue2/src/utils/dict.js
  16. 1 1
      yudao-ui-admin-vue2/src/utils/index.js
  17. 1 1
      yudao-ui-admin-vue2/src/views/bpm/form/formEditor.vue
  18. 1 1
      yudao-ui-admin-vue2/src/views/infra/build/main.js
  19. 13 13
      yudao-ui-admin-vue2/src/views/login.vue
  20. 1 1
      yudao-ui-admin-vue2/src/views/mp/autoReply/index.vue
  21. 1 1
      yudao-ui-admin-vue2/src/views/mp/components/wx-editor/WxEditor.vue
  22. 1 1
      yudao-ui-admin-vue2/src/views/mp/components/wx-material-select/main.vue
  23. 1 1
      yudao-ui-admin-vue2/src/views/mp/components/wx-msg/main.vue
  24. 1 1
      yudao-ui-admin-vue2/src/views/mp/components/wx-news/main.vue
  25. 1 1
      yudao-ui-admin-vue2/src/views/mp/components/wx-reply/main.vue
  26. 1 1
      yudao-ui-admin-vue2/src/views/mp/components/wx-video-play/main.vue
  27. 1 1
      yudao-ui-admin-vue2/src/views/mp/components/wx-voice-play/main.vue
  28. 1 1
      yudao-ui-admin-vue2/src/views/mp/draft/index.vue
  29. 1 1
      yudao-ui-admin-vue2/src/views/mp/freePublish/index.vue
  30. 2 2
      yudao-ui-admin-vue2/src/views/mp/material/index.vue
  31. 1 1
      yudao-ui-admin-vue2/src/views/mp/menu/index.vue
  32. 1 1
      yudao-ui-admin-vue2/vue.config.js

+ 4 - 3
yudao-ui-admin-vue2/.env.dev

@@ -2,10 +2,11 @@
 ENV = 'development'
 
 # 页面标题
-VUE_APP_TITLE = 芋道管理系统
+VUE_APP_TITLE = 点餐系统
 
-# 芋道管理系统/开发环境
-VUE_APP_BASE_API = 'http://localhost:48080'
+# 点餐系统/开发环境
+# VUE_APP_BASE_API = 'http://server.ayaojies.com.cn:48080'
+VUE_APP_BASE_API='http://101.42.42.150:800/prod-api'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

+ 2 - 2
yudao-ui-admin-vue2/.env.front

@@ -2,9 +2,9 @@
 ENV = 'development'
 
 # 页面标题
-VUE_APP_TITLE = 芋道管理系统
+VUE_APP_TITLE = 点餐系统
 
-# 芋道管理系统/本地环境
+# 点餐系统/本地环境
 VUE_APP_BASE_API = 'http://api-dashboard.yudao.iocoder.cn'
 
 # 路由懒加载

+ 4 - 4
yudao-ui-admin-vue2/.env.prod

@@ -2,18 +2,18 @@
 NODE_ENV = 'production'
 
 # 页面标题
-VUE_APP_TITLE = 芋道管理系统
+VUE_APP_TITLE = 点餐系统
 
-# 芋道管理系统/生产环境
+# 点餐系统/生产环境
 VUE_APP_BASE_API = '/prod-api'
 
 # 根据服务器或域名修改
-PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
+PUBLIC_PATH = 'http://101.42.42.150:800/'
 # 二级部署路径
 VUE_APP_APP_NAME ='yudao-admin'
 
 # 多租户的开关
-VUE_APP_TENANT_ENABLE = true
+VUE_APP_TENANT_ENABLE = false
 
 # 验证码的开关
 VUE_APP_CAPTCHA_ENABLE = true

+ 2 - 2
yudao-ui-admin-vue2/.env.stage

@@ -1,12 +1,12 @@
 NODE_ENV = production
 
 # 页面标题
-VUE_APP_TITLE = 芋道管理系统
+VUE_APP_TITLE = 点餐系统
 
 # 测试环境配置
 ENV = 'staging'
 
-# 芋道管理系统/测试环境
+# 点餐系统/测试环境
 VUE_APP_BASE_API = 'http://api-dashboard.yudao.iocoder.cn'
 
 # 静态资源地址

+ 2 - 2
yudao-ui-admin-vue2/.env.static

@@ -4,9 +4,9 @@ NODE_ENV = development
 ENV = 'staging'
 
 # 页面标题
-VUE_APP_TITLE = 芋道管理系统
+VUE_APP_TITLE = 点餐系统
 
-# 芋道管理系统/测试环境
+# 点餐系统/测试环境
 VUE_APP_BASE_API = 'http://127.0.0.1:48080'
 
 # 根据服务器或域名修改

BIN
yudao-ui-admin-vue2/dist.rar


+ 1 - 1
yudao-ui-admin-vue2/package.json

@@ -1,7 +1,7 @@
 {
   "name": "yudao-ui-admin",
   "version": "2.2.0-snapshot",
-  "description": "芋道管理系统",
+  "description": "点餐系统",
   "author": "芋道",
   "license": "MIT",
   "scripts": {

+ 2 - 2
yudao-ui-admin-vue2/src/components/Editor/index.vue

@@ -177,12 +177,12 @@ export default {
       // 获取富文本组件实例
       let quill = this.Quill;
       // 如果上传成功
-      // edit by 芋道源码
+      // edit by 点餐系统
       if (res.code === 200 || res.code === 0) {
         // 获取光标所在位置
         let length = quill.getSelection().index;
         // 插入图片  res.url为服务器返回的图片地址
-        // edit by 芋道源码
+        // edit by 点餐系统
         quill.insertEmbed(length, "image", res.data);
         // 调整光标到最后
         quill.setSelection(length + 1);

+ 1 - 1
yudao-ui-admin-vue2/src/components/FileUpload/index.vue

@@ -151,7 +151,7 @@ export default {
     // 上传成功回调
     handleUploadSuccess(res, file) {
       if (res.code === 0) {
-        // edit by 芋道源码
+        // edit by 点餐系统
         this.uploadList.push({ name: res.data, url: res.data });
         this.uploadedSuccessfully();
       } else {

+ 2 - 2
yudao-ui-admin-vue2/src/components/ImageUpload/index.vue

@@ -90,7 +90,7 @@ export default {
           // 然后将数组转为对象数组
           this.fileList = list.map(item => {
             if (typeof item === "string") {
-              // edit by 芋道源码
+              // edit by 点餐系统
               item = { name: item, url: item };
             }
             return item;
@@ -121,7 +121,7 @@ export default {
     },
     // 上传成功回调
     handleUploadSuccess(res) {
-      // edit by 芋道源码
+      // edit by 点餐系统
       this.uploadList.push({ name: res.data, url: res.data });
       if (this.uploadList.length === this.number) {
         this.fileList = this.fileList.concat(this.uploadList);

+ 1 - 1
yudao-ui-admin-vue2/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue

@@ -455,7 +455,7 @@ export default {
         this.previewModelVisible = true;
       });
     },
-    /* ------------------------------------------------ 芋道源码 methods ------------------------------------------------------ */
+    /* ------------------------------------------------ 点餐系统 methods ------------------------------------------------------ */
     async processSave() {
       const { err, xml } = await this.bpmnModeler.saveXML();
       // 读取异常时抛出异常

+ 2 - 2
yudao-ui-admin-vue2/src/components/parser/Parser.vue

@@ -87,7 +87,7 @@ function renderFormItem(h, elementList) {
     const config = scheme.__config__
     const layout = layouts[config.layout]
 
-    // edit by 芋道源码,解决 el-upload 上传的问题
+    // edit by 点餐系统,解决 el-upload 上传的问题
     // 参考 https://github.com/JakHuang/form-generator/blob/master/src/components/parser/example/Index.vue 实现
     const vModel = scheme.__vModel__
     const val = data[vModel]
@@ -216,7 +216,7 @@ export default {
       this.$refs[this.formConf.formRef].validate(valid => {
         if (!valid) return false
         // 触发 submit 事件
-        // update by 芋道源码
+        // update by 点餐系统
         // this.$emit('submit', this[this.formConf.formModel])
         this.$emit('submit', {
           conf: this.formConfCopy,

+ 1 - 1
yudao-ui-admin-vue2/src/layout/components/Sidebar/Logo.vue

@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: '芋道管理系统',
+      title: '点餐系统',
       logo: logoImg
     }
   }

+ 1 - 1
yudao-ui-admin-vue2/src/utils/constants.js

@@ -1,5 +1,5 @@
 /**
- * Created by 芋道源码
+ * Created by 点餐系统
  *
  * 枚举类
  */

+ 1 - 1
yudao-ui-admin-vue2/src/utils/dict.js

@@ -1,5 +1,5 @@
 /**
- * Created by 芋道源码
+ * Created by 点餐系统
  *
  * 数据字典工具类
  */

+ 1 - 1
yudao-ui-admin-vue2/src/utils/index.js

@@ -272,7 +272,7 @@ export function debounce(func, wait, immediate) {
 // }
 
 // 深拷贝对象
-// add by 芋道源码 https://github.com/JakHuang/form-generator/blob/dev/src/utils/index.js#L107
+// add by 点餐系统 https://github.com/JakHuang/form-generator/blob/dev/src/utils/index.js#L107
 export function deepClone(obj) {
   const _toString = Object.prototype.toString
 

+ 1 - 1
yudao-ui-admin-vue2/src/views/bpm/form/formEditor.vue

@@ -274,7 +274,7 @@ export default {
     }
   },
   mounted() {
-    // 【add by 芋道源码】不读缓存
+    // 【add by 点餐系统】不读缓存
     // if (Array.isArray(drawingListInDB) && drawingListInDB.length > 0) {
     //   this.drawingList = drawingListInDB
     // } else {

+ 1 - 1
yudao-ui-admin-vue2/src/views/infra/build/main.js

@@ -11,7 +11,7 @@ Vue.component('tinymce', Tinymce)
 Vue.config.productionTip = false
 Vue.prototype.$axios = axios
 
-// add by 芋道源码:引用自 https://github.com/JakHuang/form-generator/tree/dev/src/views/index
+// add by 点餐系统:引用自 https://github.com/JakHuang/form-generator/tree/dev/src/views/index
 
 new Vue({
   router,

+ 13 - 13
yudao-ui-admin-vue2/src/views/login.vue

@@ -1,6 +1,6 @@
 <template xmlns="">
   <div class="container">
-    <div class="logo"></div>
+    <!-- <div class="logo"></div> -->
     <!-- 登录区域 -->
     <div class="content">
       <!-- 配图 -->
@@ -9,7 +9,7 @@
       <div class="field">
         <!-- [移动端]标题 -->
         <h2 class="mobile-title">
-          <h3 class="title">芋道后台管理系统</h3>
+          <h3 class="title">后台管理系统</h3>
         </h2>
 
         <!-- 表单 -->
@@ -17,16 +17,16 @@
           <el-tabs class="form" v-model="loginForm.loginType" style=" float:none;">
             <el-tab-pane label="账号密码登录" name="uname">
             </el-tab-pane>
-            <el-tab-pane label="短信验证码登录" name="sms">
-            </el-tab-pane>
+            <!-- <el-tab-pane label="短信验证码登录" name="sms">
+            </el-tab-pane> -->
           </el-tabs>
           <div>
             <el-form ref="loginForm" :model="loginForm" :rules="LoginRules" class="login-form">
-              <el-form-item prop="tenantName" v-if="tenantEnable">
+              <!-- <el-form-item prop="tenantName" v-if="tenantEnable">
                 <el-input v-model="loginForm.tenantName" type="text" auto-complete="off" placeholder='租户'>
                   <svg-icon slot="prefix" icon-class="tree" class="el-input__icon input-icon"/>
                 </el-input>
-              </el-form-item>
+              </el-form-item> -->
               <!-- 账号密码登录 -->
               <div v-if="loginForm.loginType === 'uname'">
                 <el-form-item prop="username">
@@ -75,22 +75,22 @@
               </el-form-item>
 
               <!--  社交登录 -->
-             <el-form-item style="width:100%;">
+             <!-- <el-form-item style="width:100%;">
                   <div class="oauth-login" style="display:flex">
                     <div class="oauth-login-item" v-for="item in SysUserSocialTypeEnum" :key="item.type" @click="doSocialLogin(item)">
                       <img :src="item.img" height="25px" width="25px" alt="登录" >
                       <span>{{item.title}}</span>
                     </div>
                 </div>
-              </el-form-item>
+              </el-form-item> -->
 
               <!-- 教程说明 -->
-              <el-form-item style="width:100%; margin-top:-25px">
+              <!-- <el-form-item style="width:100%; margin-top:-25px">
                 <el-link href="https://doc.iocoder.cn/" target="_blank">📚开发指南</el-link>
                 <el-link href="https://doc.iocoder.cn/video/" target="_blank" style="padding-left: 10px">🔥视频教程</el-link>
                 <el-link href="https://www.iocoder.cn/Interview/good-collection/" target="_blank" style="padding-left: 10px">⚡面试手册</el-link>
                 <el-link href="http://static.yudao.iocoder.cn/mp/Aix9975.jpeg" target="_blank" style="padding-left: 10px">🤝外包咨询</el-link>
-              </el-form-item>
+              </el-form-item> -->
             </el-form>
           </div>
         </div>
@@ -139,13 +139,13 @@ export default {
       mobileCodeTimer: 0,
       loginForm: {
         loginType: "uname",
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
         captchaVerification: "",
         mobile: "",
         mobileCode: "",
         rememberMe: false,
-        tenantName: "芋道源码",
+        tenantName: "点餐系统",
       },
       scene: 21,
 

+ 1 - 1
yudao-ui-admin-vue2/src/views/mp/autoReply/index.vue

@@ -20,7 +20,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-  芋道源码
+  点餐系统
   ① 移除 avue 框架,使用 element-ui 重写
   ② 重写代码,保持和现有项目保持一致
 -->

+ 1 - 1
yudao-ui-admin-vue2/src/views/mp/components/wx-editor/WxEditor.vue

@@ -1,7 +1,7 @@
 <!--
   - Copyright (C) 2018-2019
   - All rights reserved, Designed By www.joolun.com
-  芋道源码
+  点餐系统
   ① 调整 uploadData 属性,只需要传入 accountId 即可
 -->
 <template>

+ 1 - 1
yudao-ui-admin-vue2/src/views/mp/components/wx-material-select/main.vue

@@ -1,7 +1,7 @@
 <!--
   - Copyright (C) 2018-2019
   - All rights reserved, Designed By www.joolun.com
-  芋道源码
+  点餐系统
   ① 移除 avue 组件,使用 ElementUI 原生组件
 -->
 <template>

+ 1 - 1
yudao-ui-admin-vue2/src/views/mp/components/wx-msg/main.vue

@@ -1,7 +1,7 @@
 <!--
   - Copyright (C) 2018-2019
   - All rights reserved, Designed By www.joolun.com
-  芋道源码
+  点餐系统
   ① 移除暂时用不到的 websocket
   ② 代码优化,补充注释,提升阅读性
 -->

+ 1 - 1
yudao-ui-admin-vue2/src/views/mp/components/wx-news/main.vue

@@ -2,7 +2,7 @@
   - Copyright (C) 2018-2019
   - All rights reserved, Designed By www.joolun.com
   【微信消息 - 图文】
-  芋道源码
+  点餐系统
   ① 代码优化,补充注释,提升阅读性
 -->
 <template>

+ 1 - 1
yudao-ui-admin-vue2/src/views/mp/components/wx-reply/main.vue

@@ -1,7 +1,7 @@
 <!--
   - Copyright (C) 2018-2019
   - All rights reserved, Designed By www.joolun.com
-  芋道源码
+  点餐系统
   ① 移除多余的 rep 为前缀的变量,让 message 消息更简单
   ② 代码优化,补充注释,提升阅读性
   ③ 优化消息的临时缓存策略,发送消息时,只清理被发送消息的 tab,不会强制切回到 text 输入

+ 1 - 1
yudao-ui-admin-vue2/src/views/mp/components/wx-video-play/main.vue

@@ -2,7 +2,7 @@
   - Copyright (C) 2018-2019
   - All rights reserved, Designed By www.joolun.com
   【微信消息 - 视频】
-  芋道源码
+  点餐系统
   ① bug 修复:
     1)joolun 的做法:使用 mediaId 从微信公众号,下载对应的 mp4 素材,从而播放内容;
       存在的问题:mediaId 有效期是 3 天,超过时间后无法播放

+ 1 - 1
yudao-ui-admin-vue2/src/views/mp/components/wx-voice-play/main.vue

@@ -2,7 +2,7 @@
   - Copyright (C) 2018-2019
   - All rights reserved, Designed By www.joolun.com
   【微信消息 - 语音】
-   芋道源码
+   点餐系统
   ① bug 修复:
     1)joolun 的做法:使用 mediaId 从微信公众号,下载对应的 mp4 素材,从而播放内容;
       存在的问题:mediaId 有效期是 3 天,超过时间后无法播放

+ 1 - 1
yudao-ui-admin-vue2/src/views/mp/draft/index.vue

@@ -20,7 +20,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-  芋道源码
+  点餐系统
   ① 优化代码,和项目的代码保持一致
   ② 清理冗余代码,保证代码整洁
   ③ 增加注释,提升可读性

+ 1 - 1
yudao-ui-admin-vue2/src/views/mp/freePublish/index.vue

@@ -20,7 +20,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-  芋道源码
+  点餐系统
   ① 优化代码,和项目的代码保持一致
 -->
 <template>

+ 2 - 2
yudao-ui-admin-vue2/src/views/mp/material/index.vue

@@ -20,7 +20,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-  芋道源码
+  点餐系统
   ① 清理冗余 css 内容,清理冗余 data 变量
   ② 美化样式,支持播放,提升使用体验
   ③ 优化代码,特别是方法名和变量,提升可读性
@@ -401,7 +401,7 @@ export default {
   width: 100%;
   column-gap:10px;
   column-count: 5;
-  margin-top: 10px; /* 芋道源码:增加 10px,避免顶着上面 */
+  margin-top: 10px; /* 点餐系统:增加 10px,避免顶着上面 */
 }
 .waterfall-item {
   padding: 10px;

+ 1 - 1
yudao-ui-admin-vue2/src/views/mp/menu/index.vue

@@ -20,7 +20,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-  芋道源码
+  点餐系统
   ① less 切到 scss,减少对 less 和 less-loader 的依赖
 -->

+ 1 - 1
yudao-ui-admin-vue2/vue.config.js

@@ -8,7 +8,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || '芋道管理系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || '点餐系统' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口