Merge branch 'master' of http://git.ketter.cn/farwalker/ycwh

admin_ui/src/option/ycwh/famousStore.js

@@ -85,7 +85,6 @@ export default {
       viewDisplay: false,
       hide: true,
     },
-
     {
       label: "封面",
       prop: "cover",

admin_ui/src/views/ycwh/components/editDocumentInfo/index.scss

@@ -50,4 +50,26 @@
     font-size: 20px;
     font-weight: bold;
     padding-left: 15px;
+}
+
+.video-del-btn {
+    position: absolute;
+    right: 20px;
+    top: -5px;
+    cursor: default;
+    border-radius: 50%;
+    font-size: 15px;
+    font-weight: bold;
+    color: white;
+    background-color: #b1b1b1;
+    z-index: 999;
+    height: 25px;
+    width: 25px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.video-del-btn:hover {
+    background: #999999;
 }

admin_ui/src/views/ycwh/components/editDocumentInfo/index.vue

@@ -32,7 +32,12 @@
       </div>
     </el-form-item>
     <el-form-item label="视频" prop="videos">
-      <div style="display: flex;">
+      <div style="display: flex;position: relative;">
+        <div v-if="form.videos" class="video-del-btn" @click="delVideos">
+          <el-icon>
+            <Close />
+          </el-icon>
+        </div>
         <el-upload class="avatar-uploader cover-w16h9" style="margin-right: 30px !important;" :http-request="uploadImg" :data="{type:'video'}" :show-file-list="false" :before-upload="beforeAvatarUpload">
           <video fit="contain" v-if="form.videos" :src="form.videos" class="avatar"></video>
           <el-icon v-else class="el-icon-plus avatar-uploader-icon">
@@ -149,7 +154,7 @@
           data: {},
           propsHttp: {
             home: '',
-            url: 'url',
+            url: 'link',
             res: 'data'
           },
           //七牛云oss配置

admin_ui/src/views/ycwh/components/editFamousDish/index.scss

@@ -50,4 +50,26 @@
     font-size: 20px;
     font-weight: bold;
     padding-left: 15px;
+}
+
+.video-del-btn {
+    position: absolute;
+    right: 20px;
+    top: -5px;
+    cursor: default;
+    border-radius: 50%;
+    font-size: 15px;
+    font-weight: bold;
+    color: white;
+    background-color: #b1b1b1;
+    z-index: 999;
+    height: 25px;
+    width: 25px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.video-del-btn:hover {
+    background: #999999;
 }

admin_ui/src/views/ycwh/components/editFamousDish/index.vue

@@ -5,7 +5,7 @@
     </el-form-item>
     <el-form-item label="所属菜系" prop="cuisineCode">
       <div style="display: flex;">
-        <el-select v-model="form.cuisineCode" placeholder="请选择所属菜系">
+        <el-select v-model="form.cuisineCode" placeholder="请选择所属菜系" clearable>
           <el-option v-for="item in cuisineList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
         </el-select>
       </div>
@@ -42,7 +42,12 @@
       </div>
     </el-form-item>
     <el-form-item label="视频" prop="videos">
-      <div style="display: flex;">
+      <div style="display: flex;position: relative;">
+        <div v-if="form.videos" class="video-del-btn" @click="delVideos">
+          <el-icon>
+            <Close />
+          </el-icon>
+        </div>
         <el-upload class="avatar-uploader cover-w16h9" style="margin-right: 30px !important;" :http-request="uploadImg" :data="{type:'video'}" :show-file-list="false" :before-upload="beforeAvatarUpload">
           <video fit="contain" v-if="form.videos" :src="form.videos" class="avatar"></video>
           <el-icon v-else class="el-icon-plus avatar-uploader-icon">
@@ -171,7 +176,7 @@
         // 富文本相关配置
         editorOptions: {
           //普通上传地址
-          action: "https://api.avuejs.com/imgupload",
+          action: "/api/blade-resource/oss/endpoint/put-file",//"https://api.avuejs.com/imgupload",
           customConfig: {}, //wangEditor编辑的配置
           //是否启用oss(qiniu/ali)
           oss: '',
@@ -179,7 +184,7 @@
           data: {},
           propsHttp: {
             home: '',
-            url: 'url',
+            url: 'link',
             res: 'data'
           },
           //七牛云oss配置
@@ -269,6 +274,9 @@
         this.form = data || {}
         this.contentItemVisible = true
       },
+      delVideos() {
+        this.form.videos = '';
+      },
       toSave(isPublish) {
         if(this.loading) {
           return;

admin_ui/src/views/ycwh/components/editFamousSnacks/index.scss

@@ -50,4 +50,26 @@
     font-size: 20px;
     font-weight: bold;
     padding-left: 15px;
+}
+
+.video-del-btn {
+    position: absolute;
+    right: 20px;
+    top: -5px;
+    cursor: default;
+    border-radius: 50%;
+    font-size: 15px;
+    font-weight: bold;
+    color: white;
+    background-color: #b1b1b1;
+    z-index: 999;
+    height: 25px;
+    width: 25px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.video-del-btn:hover {
+    background: #999999;
 }

admin_ui/src/views/ycwh/components/editFamousSnacks/index.vue

@@ -5,7 +5,7 @@
     </el-form-item>
     <el-form-item label="所属菜系" prop="cuisineCode">
       <div style="display: flex;">
-        <el-select v-model="form.cuisineCode" placeholder="请选择所属菜系">
+        <el-select v-model="form.cuisineCode" placeholder="请选择所属菜系" clearable>
           <el-option v-for="item in cuisineList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
         </el-select>
       </div>
@@ -42,7 +42,12 @@
       </div>
     </el-form-item>
     <el-form-item label="视频" prop="videos">
-      <div style="display: flex;">
+      <div style="display: flex;position: relative;">
+        <div v-if="form.videos" class="video-del-btn" @click="delVideos">
+          <el-icon>
+            <Close />
+          </el-icon>
+        </div>
         <el-upload class="avatar-uploader cover-w16h9" style="margin-right: 30px !important;" :http-request="uploadImg" :data="{type:'video'}" :show-file-list="false" :before-upload="beforeAvatarUpload">
           <video fit="contain" v-if="form.videos" :src="form.videos" class="avatar"></video>
           <el-icon v-else class="el-icon-plus avatar-uploader-icon">
@@ -171,7 +176,7 @@
         // 富文本相关配置
         editorOptions: {
           //普通上传地址
-          action: "https://api.avuejs.com/imgupload",
+          action: "/api/blade-resource/oss/endpoint/put-file",//"https://api.avuejs.com/imgupload",
           customConfig: {}, //wangEditor编辑的配置
           //是否启用oss(qiniu/ali)
           oss: '',
@@ -179,7 +184,7 @@
           data: {},
           propsHttp: {
             home: '',
-            url: 'url',
+            url: 'link',
             res: 'data'
           },
           //七牛云oss配置
@@ -374,6 +379,9 @@
         }
         return true;
       },
+      delVideos() {
+        this.form.videos = '';
+      },
       handlePreview(file) {
         window.open(file.url);
       },

admin_ui/src/views/ycwh/components/editFamousStore/index.scss

@@ -50,4 +50,26 @@
     font-size: 20px;
     font-weight: bold;
     padding-left: 15px;
+}
+
+.video-del-btn {
+    position: absolute;
+    right: 20px;
+    top: -5px;
+    cursor: default;
+    border-radius: 50%;
+    font-size: 15px;
+    font-weight: bold;
+    color: white;
+    background-color: #b1b1b1;
+    z-index: 999;
+    height: 25px;
+    width: 25px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.video-del-btn:hover {
+    background: #999999;
 }

admin_ui/src/views/ycwh/components/editFamousStore/index.vue

@@ -5,7 +5,7 @@
     </el-form-item>
     <el-form-item label="所属菜系" prop="cuisineCode">
       <div style="display: flex;">
-        <el-select v-model="form.cuisineCode" placeholder="请选择所属菜系">
+        <el-select v-model="form.cuisineCode" placeholder="请选择所属菜系" clearable>
           <el-option v-for="item in cuisineList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
         </el-select>
       </div>
@@ -42,7 +42,12 @@
       </div>
     </el-form-item>
     <el-form-item label="视频" prop="videos">
-      <div style="display: flex;">
+      <div style="display: flex;position: relative;">
+        <div v-if="form.videos" class="video-del-btn" @click="delVideos">
+          <el-icon>
+            <Close />
+          </el-icon>
+        </div>
         <el-upload class="avatar-uploader cover-w16h9" style="margin-right: 30px !important;" :http-request="uploadImg" :data="{type:'video'}" :show-file-list="false" :before-upload="beforeAvatarUpload">
           <video fit="contain" v-if="form.videos" :src="form.videos" class="avatar"></video>
           <el-icon v-else class="el-icon-plus avatar-uploader-icon">
@@ -171,7 +176,7 @@
         // 富文本相关配置
         editorOptions: {
           //普通上传地址
-          action: "https://api.avuejs.com/imgupload",
+          action: "/api/blade-resource/oss/endpoint/put-file",//"https://api.avuejs.com/imgupload",
           customConfig: {}, //wangEditor编辑的配置
           //是否启用oss(qiniu/ali)
           oss: '',
@@ -179,7 +184,7 @@
           data: {},
           propsHttp: {
             home: '',
-            url: 'url',
+            url: 'link',
             res: 'data'
           },
           //七牛云oss配置
@@ -373,6 +378,9 @@
         }
         return true;
       },
+      delVideos() {
+        this.form.videos = '';
+      },
       handlePreview(file) {
         window.open(file.url);
       },

admin_ui/src/views/ycwh/components/editInformationInfo/index.scss

@@ -50,4 +50,26 @@
     font-size: 20px;
     font-weight: bold;
     padding-left: 15px;
+}
+
+.video-del-btn {
+    position: absolute;
+    right: 20px;
+    top: -5px;
+    cursor: default;
+    border-radius: 50%;
+    font-size: 15px;
+    font-weight: bold;
+    color: white;
+    background-color: #b1b1b1;
+    z-index: 999;
+    height: 25px;
+    width: 25px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.video-del-btn:hover {
+    background: #999999;
 }

admin_ui/src/views/ycwh/components/editInformationInfo/index.vue

@@ -33,7 +33,12 @@
       </div>
     </el-form-item>
     <el-form-item label="视频" prop="videos">
-      <div style="display: flex;">
+      <div style="display: flex;position: relative;">
+        <div v-if="form.videos" class="video-del-btn" @click="delVideos">
+          <el-icon>
+            <Close />
+          </el-icon>
+        </div>
         <el-upload class="avatar-uploader cover-w16h9" style="margin-right: 30px !important;" :http-request="uploadImg" :data="{type:'video'}" :show-file-list="false" :before-upload="beforeAvatarUpload">
           <video fit="contain" v-if="form.videos" :src="form.videos" class="avatar"></video>
           <el-icon v-else class="el-icon-plus avatar-uploader-icon">
@@ -317,6 +322,9 @@
         }
         return true;
       },
+      delVideos() {
+        this.form.videos = '';
+      },
       handlePreview(file) {
         window.open(file.url);
       },

admin_ui/src/views/ycwh/components/editProfessionalStyle/index.scss

@@ -50,4 +50,26 @@
     font-size: 20px;
     font-weight: bold;
     padding-left: 15px;
+}
+
+.video-del-btn {
+    position: absolute;
+    right: 20px;
+    top: -5px;
+    cursor: default;
+    border-radius: 50%;
+    font-size: 15px;
+    font-weight: bold;
+    color: white;
+    background-color: #b1b1b1;
+    z-index: 999;
+    height: 25px;
+    width: 25px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.video-del-btn:hover {
+    background: #999999;
 }

admin_ui/src/views/ycwh/components/editProfessionalStyle/index.vue

@@ -33,7 +33,12 @@
       </div>
     </el-form-item>
     <el-form-item label="视频" prop="videos">
-      <div style="display: flex;">
+      <div style="display: flex;position: relative;">
+        <div v-if="form.videos" class="video-del-btn" @click="delVideos">
+          <el-icon>
+            <Close />
+          </el-icon>
+        </div>
         <el-upload class="avatar-uploader cover-w16h9" style="margin-right: 30px !important;" :http-request="uploadImg" :data="{type:'video'}" :show-file-list="false" :before-upload="beforeAvatarUpload">
           <video fit="contain" v-if="form.videos" :src="form.videos" class="avatar"></video>
           <el-icon v-else class="el-icon-plus avatar-uploader-icon">
@@ -147,7 +152,7 @@
         // 富文本相关配置
         editorOptions: {
           //普通上传地址
-          action: "https://api.avuejs.com/imgupload",
+          action: "/api/blade-resource/oss/endpoint/put-file",//"https://api.avuejs.com/imgupload",
           customConfig: {}, //wangEditor编辑的配置
           //是否启用oss(qiniu/ali)
           oss: '',
@@ -155,7 +160,7 @@
           data: {},
           propsHttp: {
             home: '',
-            url: 'url',
+            url: 'link',
             res: 'data'
           },
           //七牛云oss配置
@@ -317,6 +322,9 @@
         }
         return true;
       },
+      delVideos() {
+        this.form.videos = '';
+      },
       handlePreview(file) {
         window.open(file.url);
       },

miniapp/common/setting.js

@@ -5,11 +5,11 @@ module.exports = {
 	// 应用名
 	name: 'Yuecai',
 	// 应用logo，支持本地路径和网络路径
-	logo: '/static/images/blocktime.png',
+	logo: '/static/images/home/logo.png',
 	// 版本号
 	version: '0.1.0',
 	// 开发环境接口Url
-	devUrl: 'http://192.168.3.162:9232',//因为是微服务架构，所以开发环境也全部调服务器，需要调本地服务的配置到biz.js里
+	devUrl: 'http://192.168.3.182:9232',//因为是微服务架构，所以开发环境也全部调服务器，需要调本地服务的配置到biz.js里
 	// 线上环境接口Url
 	prodUrl: 'http://ycwh.pj.farwalker.cn/api',
 	// 后端数据的接收方式application/json;charset=UTF-8或者application/x-www-form-urlencoded;charset=UTF-8