fix

src/components/Sidebar.vue

@@ -1,7 +1,6 @@
 <template>
   <div>
-        <el-menu
+    <el-menu class="sidebar-el-menu"
-            class="sidebar-el-menu"
              :default-active="onRoutes"
              background-color="#324157"
              text-color="#bfcbd9"
@@ -9,38 +8,33 @@
              unique-opened
              mode="horizontal"
              router
-            @select="handleSelect"
+             @select="handleSelect">
-        >
       <template v-for="item in menus">
         <template v-if="item.subs">
-                    <el-submenu :index="item.index" :key="item.index">
+          <el-submenu :index="item.index"
+                      :key="item.index">
             <template slot="title">
               <i :class="item.icon"></i>
               <span slot="title">{{ item.title }}</span>
             </template>
             <template v-for="subItem in item.subs">
-                            <el-submenu
+              <el-submenu v-if="subItem.subs"
-                                v-if="subItem.subs"
                           :index="subItem.index"
-                                :key="subItem.index"
+                          :key="subItem.index">
-                            >
                 <template slot="title">{{ subItem.title }}</template>
-                                <el-menu-item
+                <el-menu-item v-for="(threeItem,i) in subItem.subs"
-                                    v-for="(threeItem,i) in subItem.subs"
                               :key="i"
-                                    :index="threeItem.index"
+                              :index="threeItem.index">{{ threeItem.title }}</el-menu-item>
-                                >{{ threeItem.title }}</el-menu-item>
               </el-submenu>
-                            <el-menu-item
+              <el-menu-item v-else
-                                v-else
                             :index="subItem.index"
-                                :key="subItem.index"
+                            :key="subItem.index">{{ subItem.title }}</el-menu-item>
-                            >{{ subItem.title }}</el-menu-item>
             </template>
           </el-submenu>
         </template>
         <template v-else>
-                    <el-menu-item :index="item.index" :key="item.index">
+          <el-menu-item :index="item.index"
+                        :key="item.index">
             <i :class="item.icon"></i>
             <span slot="title">{{ item.title }}</span>
           </el-menu-item>
@@ -54,7 +48,7 @@
 import Setting from '@/setting'
 import addRoutes from '@/libs/route/addRoutes'
 export default {
-    data() {
+  data () {
     return {
       menuList: [
         {
@@ -127,29 +121,29 @@ export default {
       onRoutes: this.$route.path
     };
   },
-    watch:{
+  watch: {
-        "$route.path":function(val){
+    "$route.path": function (val) {
-            this.menuList.map(e=>{
+      this.menuList.map(e => {
-                if(val.replace('/', '')===e.index){
+        if (val.replace('/', '') === e.index) {
           this.handleSelect(val.replace('/', ''))
           this.$forceUpdate();
         }
       })
     }
   },
-    mounted() {
+  mounted () {
-      sessionStorage.getItem('sideBar') && this.handleSelect(sessionStorage.getItem('sideBar'))
+    // sessionStorage.getItem('sideBar') && this.handleSelect(sessionStorage.getItem('sideBar'))
     sessionStorage.getItem('token') && this.getPer() // 登录了才获取权限
   },
-    methods:{
+  methods: {
-        handleSelect(index){
+    handleSelect (index) {
       this.onRoutes = index
       this.$store.commit('setOrderParam', null)
       this.$store.commit('setInfoTab', '1')
       this.$store.commit('setColumnId', '')
-            sessionStorage.setItem('sideBar',index)
+      sessionStorage.setItem('sideBar', index)
     },
-        initMenu() {
+    initMenu () {
       if (Setting.dynamicRoute) {
         const routes = this.$store.state.routes
         const menus = []
@@ -162,7 +156,7 @@ export default {
       }
     },
     // 获取权限列表
-        getPer() {
+    getPer () {
       this.$get(`${this.api.getUserRolesPermissionMenu}?platformId=${Setting.platformId}`).then(res => {
         const routes = res.permissionMenu[0].children
         addRoutes(routes)

src/components/img-upload/Cropper.vue

@@ -92,7 +92,7 @@ export default {
       previews: {}, // 预览数据
       option: {
         img: '', // 裁剪图片的地址  (默认：空)
-        size: 0.8, // 裁剪生成图片的质量  (默认:1)
+        size: 1, // 裁剪生成图片的质量  (默认:1)
         full: true, // 是否输出原图比例的截图 选true生成的图片会非常大  (默认:false)
         outputType: 'jpg', // 裁剪生成图片的格式  (默认:jpg)
         canMove: true, // 上传图片是否可以移动  (默认:true)
@@ -125,7 +125,7 @@ export default {
     },
     updateImg (file) {
       this.option.img = file.url
-      this.option.size = file.size / 1024 > 200 ? 0.9 : 0.95
+      // this.option.size = file.size / 1024 > 200 ? 0.9 : 0.95
     },
     realTime (data) {
       // 实时预览
@@ -139,7 +139,7 @@ export default {
       const that = this
       if (type === 'blob') {
         this.$refs.cropper.getCropBlob(data => {
-          compress(data, 0.8).then(res => {
+          compress(data, 1).then(res => {
             that.$emit('upload', res)
           })
         })

src/views/customer/AddCustomer.vue

@@ -60,7 +60,8 @@
                              :label="item.schoolName"
                              :value="item.schoolId"></el-option>
                 </el-select>
-                <i class="el-icon-circle-plus-outline plus-cus"
+                <i v-if="!isDetail"
+                   class="el-icon-circle-plus-outline plus-cus"
                    @click="addCustomer"></i>
               </div>
             </el-form-item>
@@ -864,7 +865,7 @@ export default {
         data.map((e, i) => {
           e.id = i
           const list = e.startAndEndTimeList
-          if (list) {
+          if (list && list.length) {
             let connect = true // 每个订单的开始结束日期是否连续
             list.map((n, i) => {
               // 第一个不用计算。用当前订单的开始日期跟上一个订单的结束日期做比较，只差一天，就表示是连续订单

src/views/parnerOperation/schemeSet.vue

@@ -515,7 +515,7 @@ export default {
     },
     handleCurrentChange (val) {
       this.page = val;
-      this.getData();
+      this.getProduct();
     },
     handleSelectionChange (val) {
       console.log("🚀 ~ file: schemeSet.vue:516 ~ handleSelectionChange ~ val:", val)
@@ -529,7 +529,6 @@ export default {
       }).then(() => {
         this.checkeds.splice(i, 1)
       }).catch(() => { })
-
     },
     // 选择产品提交
     productSubmit () {

src/views/shop/addProduct/index.vue

@@ -283,6 +283,7 @@
                          :limit="1"
                          :action="api.fileupload"
                          :headers="headers"
+                         :file-list="appletList"
                          name="file">
                 <img v-if="form.mall.appletIcon"
                      :src="form.mall.appletIcon"
@@ -807,7 +808,8 @@ export default {
       submiting: false,
       pass: false,
       updateTime: 0,
-      nameRepeat: false
+      nameRepeat: false,
+      appletList: []
     };
   },
   watch: {
@@ -864,6 +866,12 @@ export default {
         if (e.typeIds && e.typeIds.length) e.typeIds = e.typeIds[0]
         e.mall.interfaceDiagrams = e.mall.interfaceDiagram ? e.mall.interfaceDiagram.split(',') : []
         e.mallAnnex.forEach(e => e.name = e.fileName)
+        if (e.mall.appletIcon) this.appletList = [
+          {
+            name: e.mall.appletIcon,
+            url: e.mall.appletIcon
+          }
+        ]
         this.form = e
         this.getOp()
         this.$nextTick(() => {