Merge branch 'dev' of https://cloud.wodcloud.com/git/apaas/apaas-v3-ui into dev

src/assets/css/index.css

@@ -475,8 +475,8 @@ border-radius:8px;
 }
 /* 单选激活样式 */
 .el-radio__input.is-checked .el-radio__inner {
-  border-color: #838383;
-  background-color: #fff;
+  border-color: #e3e5ef;
+  background-color: #f7f8f9;
 }
 .el-radio__input.is-checked + .el-radio__label {
   color: #1a2236;

src/components/general/upload_file.vue

@@ -14,28 +14,34 @@
         class="eeupload"
         action="/apaas/static/image/upload"
         :file-list="fileArray"
-        :list-type="type=='picture'?'picture-card':''"
+        :list-type="type == 'picture' ? 'picture-card' : ''"
         :limit="max"
         :multiple="multiple"
         :on-remove="handleRemove"
         :on-success="handleAvatarSuccess"
         :before-upload="beforeAvatarUpload"
-        :class="{hide:hideUpload || readOnly}"
+        :class="{ hide: hideUpload || readOnly }"
         :readOnly="readOnly"
         :data="anotherData"
         :drag="drag"
         :disabled="disabled"
+        :accept="accepts"
       >
         <div v-if="drag">
           <i class="el-icon-upload"></i>
           <div class="el-upload__text">
-            将文件拖到此处，或
-            <em>点击上传</em>
+            <span class="up_fz">将文件拖到此处，或</span>
+            <em>点击上传</em><br />
+            <span class="up_fz">{{ up_fz }}</span>
           </div>
         </div>
-        <el-button size="small" type="primary" v-if="!drag && type=='default'">上传文件</el-button>
-        <div slot="tip" class="el-upload__tip" v-if="!drag && type=='mp3'">支持文件格式：.mp3，单个文件不能超过20M。</div>
-        <i class="el-icon-plus" v-if="!drag && type=='picture'"></i>
+        <el-button size="small" type="primary" v-if="!drag && type == 'default'"
+          >上传文件</el-button
+        >
+        <div slot="tip" class="el-upload__tip" v-if="!drag && type == 'mp3'">
+          支持文件格式：.mp3，单个文件不能超过20M。
+        </div>
+        <i class="el-icon-plus" v-if="!drag && type == 'picture'"></i>
       </el-upload>
     </div>
   </div>
@@ -97,6 +103,14 @@ export default {
       type: Boolean,
       default: false,
     },
+    up_fz: {
+      type: String,
+      default: "",
+    },
+    accepts: {
+      type: String,
+      default: "",
+    },
   },
   watch: {
     list(value) {
@@ -217,4 +231,7 @@ export default {
 .hide .el-upload--picture-card {
   display: none;
 }
+.up_fz {
+  color: #a9aec0;
+}
 </style>
\ No newline at end of file

src/components/menu.vue

@@ -254,7 +254,7 @@ export default {
       if (v.visit_url) {
         if (v.visit_url == "/fwgl/" || v.visit_url == "/yygl/") {
           this.$router.push(v.visit_url + this.$store.getters.level);
-        } else if (parent == "/shop") {
+        } else if (parent == "/services_shop") {
           this.$store.commit("serviceShopMenuAct", v.visit_url);
           this.$router.push(v.visit_url);
         } else {

src/components/shop-cloud/shop-cloud.vue

@@ -222,7 +222,7 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="22">
+                  <el-col :span="24">
                     <el-form-item class="form_item">
                       <div class="form_item_title">申请文件：</div>
                       <info-list :list_arr="docTemplate" class="doc_template"></info-list>
@@ -234,6 +234,7 @@
                         :readOnly="false"
                         :drag="true"
                         @getNewList="getNewList"
+                        class="up_f"
                       ></upload-file>
                     </el-form-item>
                   </el-col>
@@ -1549,6 +1550,9 @@ export default {
 .doc_template {
   margin: 0 0 10px 20px;
 }
+.up_f {
+  width: calc(50% - 10px);
+}
 </style>
 <style>
 .form_block .el-input .el-input__inner {
@@ -1668,4 +1672,10 @@ export default {
   padding-left: 15px;
   padding-right: 40px;
 }
+.up_f .el-upload {
+  width: 100%;
+}
+.up_f .el-upload-dragger {
+  width: 100%;
+}
 </style>

src/pages/service_shop/shop_list.vue

@@ -6,31 +6,11 @@
       </el-aside>
       <el-main>
         <service-list
-          v-show="urlFilter != '7' && urlFilter != '10'"
           :filterNames="filterNames"
           :name="name"
           :url="url"
           :urlFilter="urlFilter"
         ></service-list>
-        <div v-show="urlFilter == '7' || urlFilter == '10'">
-          <el-breadcrumb separator="/" class="bread_crumb1 bread_left">
-            <el-breadcrumb-item :to="{ path: '/shop' }">
-              {{
-              $t("lang.service_shop")
-              }}
-            </el-breadcrumb-item>
-            <el-breadcrumb-item>{{ name }}</el-breadcrumb-item>
-          </el-breadcrumb>
-          <BlockRadius class="default">
-            <div class="default_img">
-              <h1 class="default_title">开发中，敬请期待！</h1>
-              <h3 class="default_msg">
-                如需技术支持
-                <br />请联系管理员
-              </h3>
-            </div>
-          </BlockRadius>
-        </div>
       </el-main>
     </el-container>
   </div>