ytj

package.json

@@ -20,11 +20,13 @@
     "axios": "^0.18.0",
     "better-scroll": "^1.12.6",
     "canvas2image": "^1.0.5",
+    "exif-js": "^2.3.0",
     "html2canvas": "^1.0.0-alpha.12",
     "jQuery": "^1.7.4",
     "less": "^3.0.4",
     "less-loader": "^4.1.0",
     "node-sass": "^4.9.3",
+    "pako": "^1.0.7",
     "qrcodejs2": "^0.0.2",
     "sass-loader": "^7.1.0",
     "vant": "^1.3.0",

src/pages/user/App.vue

@@ -8,6 +8,9 @@
 import '../../common/css/reset.css'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: actions } = createNamespacedHelpers('userCenter')
+const { mapActions: mapIndexActions } = createNamespacedHelpers('index')
+const wx = require('weixin-js-sdk')
+import wxsdk from '@/util/share'
 export default {
   name: 'app',
   data () {
@@ -29,10 +32,25 @@ export default {
       this.code = null
     }
     this.getUserInfo({ org: this.org, code: this.code }).then(() => {
-      this.showPage = true
+      let that = this
+      wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
+        title: '城的空间',
+        desc: '城的空间',
+        link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
+        thu_image: `https://spaceofcheng.oss-cn-beijing.aliyuncs.com/indexlogo.jpg?x-oss-process=style/wxicon`
+      }).then(() => {
+        wx.getLocation({
+          type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
+          success: function (res) {
+            that.setLocation({ latitude1: res.latitude, longitude1: res.longitude })
+            that.showPage = true
+          }
+        })
+      })
     })
   },
   methods: {
+    ...mapIndexActions(['setLocation']),
     ...actions(['getUserInfo'])
   }
 }

src/pages/user/activeList/activeList.vue

@@ -27,6 +27,7 @@ export default {
 <style lang="scss" scoped>
 .content {
   padding: 0 0 0 0.1rem;
+  background: #fff;
   .list {
     width: 100%;
     height: 0.8rem;
@@ -48,6 +49,11 @@ export default {
       text-overflow: ellipsis;
       white-space: nowrap;
       font-size: 0.14rem;
+      color: rgba(50, 59, 69, 1);
+    }
+    i{
+      color: rgba(50, 59, 69, 1);
+      padding-right: .1rem;
     }
   }
 }

src/pages/user/bindMobile/page.scss

@@ -10,7 +10,6 @@
     height: 100%;
     display: flex;
     justify-content: center;
-    align-items: center;
     // background: rgba(0,0,0,0.3);
     position: relative;
     .logo{
@@ -27,11 +26,12 @@
     }
     .box{
       width: 3.25rem;
+      height: 4.2rem;
       background:rgba(255,255,255,1);
       border-radius:8px;
       padding: .2rem;
       box-sizing: border-box;
-      margin-top: .5rem;
+      margin-top: 1.2rem;
       .title{
         font-size: .16rem;
         font-weight: bold;

src/pages/user/calendar/calendar.vue

@@ -5,17 +5,17 @@
     </div>
     <div class="middle">
       <p>云台天境定制专属你的台历</p>
-      <span>时间: 2018年12月12-21日</span>
-      <span>地点: 宁区秣陵街道创新东路2号银城蓝溪郡营销中心</span>
+      <span>时间: 2018年12月12日-2018年12月19日</span>
+      <span>地点: 江宁区云台山河路1号云台天境售楼处</span>
     </div>
     <div class="bottom">
       <p class="title">活动详情</p>
-      <div>相关活动介绍参与活动需出示“城的空间”官微报名截图并支付198元现金（现金需在活动现场支付）</div>
-      <div>以上礼品需成交方可享受，成交指签订车位销售合同/商品房现售合同，并支付全部价款或支付首付款且办理完毕贷款手续，开发商承诺客户交纳的198元，我司无条件退还，活动名额仅限10人，先到先得。</div>
-      <div>活动电话：025-86426677</div>
-      <div>服务案场：银城蓝溪郡</div>
-      <div>地址：江宁区秣陵街道创新东路2号</div>
-      <div>*活动最终解释权归银城蓝溪郡开发商所有</div>
+      <div>用户在线上传照片生成2019年台历，可通过填写邮箱，获得电子版台历（1个工作日内）。</div>
+      <div>前200名上传成功用户，可在关注【城的空间】公众号接到推送或接到短信通知后来云台天境售楼处领取精美实物台历一份。</div>
+      <div>活动电话：025-86426666</div>
+      <div>服务案场：银城旭辉云台天境</div>
+      <div>地址：江宁区云台山河路1号云台天境售楼处</div>
+      <div>*活动最终解释权归南京佳运城房地产开发有限公司所有</div>
     </div>
     <div class="btn">
       <div v-if="state === 1" @click="toCheckModel">立即参与</div>
@@ -26,6 +26,7 @@
 </template>
 
 <script>
+import wxsdk from '../../../util/share'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: mapMakingActions } = createNamespacedHelpers('making')
 const { mapActions: actions } = createNamespacedHelpers('userCenter')
@@ -35,10 +36,16 @@ export default {
     return {
       topImg,
       state: 1,
-      endTime: "2018/12/22 00:00:00"
+      endTime: "2018/12/19 00:00:00"
     }
   },
   created () {
+    wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
+      title: '幸福升舱 云帆起航',
+      desc: '有一份2019年的台历待您查收！',
+      link: `${window.location.origin}${window.location.pathname}#/calendar`,
+      thu_image: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/DE4F9402-9449-48fc-8C0D-61C198E82E481543982444.png'
+    })
     this.getUserInfo({ org: this.org }).then(() => {
       this.getCalendarCustomer().then((res) => {
         if (res) {
@@ -67,7 +74,7 @@ export default {
     toCheckModel () {
       if (!this.userInfo.customer.Phone) {
         this.$dialog.confirm({
-          title: '标题',
+          title: '提示',
           message: '您还不是注册会员，注册成功后即可参与此活动'
         }).then(() => {
           // on confirm

src/pages/user/calendar/checkModel.vue

@@ -2,6 +2,7 @@
   <div class="content">
     <div @click="checkModel(1)">
       <img :src="coverBlack">
+      <p>主题一 (黑色)</p>
       <div>
         <img v-if="check === 1" :src="checked" alt>
         <img v-if="check === 2" :src="unchecked" alt>
@@ -9,6 +10,7 @@
     </div>
     <div @click="checkModel(2)">
       <img :src="coverRed">
+      <p>主题二 (红色)</p>
       <div>
         <img v-if="check === 2" :src="checked" alt>
         <img v-if="check === 1" :src="unchecked" alt>
@@ -57,6 +59,12 @@ export default {
     > img {
       width: 100%;
     }
+    p{
+      font-size: .14rem;
+      font-weight: bold;
+      text-align: center;
+      margin-top: .05rem;
+    }
     div {
       position: absolute;
       right: 0.2rem;

src/pages/user/calendar/making.vue

@@ -153,7 +153,7 @@ export default {
       bannerRed: item => item.bannerRed
     }),
     size () {
-      if (this.mainIndex === 1 || this.mainIndex === 3 || this.mainIndex === 7 || this.mainIndex === 10) {
+      if (this.mainIndex === 2 || this.mainIndex === 5 || this.mainIndex === 8 || this.mainIndex === 11) {
         return '横'
       } else {
         return '竖'
@@ -170,7 +170,7 @@ export default {
   methods: {
     ...mapMakingActions(['setBanner', 'calendar']),
     upload (url) {
-      this.banner[this.mainIndex - 1].CustomerImg = url
+      this.banner[this.mainIndex - 1].CustomerImg = url + '?x-oss-process=style/calendar-thumb'
       this.setBanner({ type: this.$route.query.type, data: JSON.parse(JSON.stringify(this.banner)) })
       console.log(this.banner)
       let cutDoms = document.getElementsByClassName('cutDom')[0]
@@ -216,8 +216,8 @@ export default {
         delete curr['defaultBg']
         delete curr['style']
         delete curr['styleCut']
-        if (!curr['CustomerImg']) {
-          curr['CustomerImg'] = curr['defaultNoUser']
+        if (!curr.CustomerImg) {
+          curr.CustomerImg = curr.defaultNoUser
         }
         delete curr['defaultNoUser']
       });
@@ -262,17 +262,28 @@ export default {
           context.webkitImageSmoothingEnabled = false;
           context.msImageSmoothingEnabled = false;
           context.imageSmoothingEnabled = false;
-
+          console.log(canvas.toDataURL('image/jpeg', 0.8))
           // 【重要】默认转化的格式为png,也可设置为其他格式
-          var img = canvas2image.convertToJPEG(canvas, canvas.width, canvas.height);
-          var blobs = that.urltoblob(img.src);
-          var namestr = `${that.banner[i].ImgName}.jpg`;
-          var file = {
-            content: img.src,
-            file: that.blobToFile(blobs, namestr)
+          // var img = canvas2image.convertToJPEG(canvas, canvas.width, canvas.height);
+          // var blobs = that.urltoblob(img.src);
+          // var namestr = `${that.banner[i].ImgName}.jpg`;
+          // var file = {
+          //   content: img.src,
+          //   file: that.blobToFile(blobs, namestr)
+          // }
+          // console.log(file)
+          // that.toolClass.upload(file).then((res) => {
+          //   that.banner[i].CalendarImg = res.result.url
+          //   that.setBanner({ type: that.$route.query.type, data: JSON.parse(JSON.stringify(that.banner)) })
+          //   resolve()
+          // }).catch(() => {
+          //   reject()
+          // })
+          let file = {
+            namestr: `${that.banner[i].ImgName}.jpg`,
+            base64str: encodeURIComponent(canvas.toDataURL('image/jpeg', 0.8))
           }
-          console.log(file)
-          that.toolClass.upload(file).then((res) => {
+          that.toolClass.uploadBase64(file).then((res) => {
             that.banner[i].CalendarImg = res.result.url
             that.setBanner({ type: that.$route.query.type, data: JSON.parse(JSON.stringify(that.banner)) })
             resolve()

src/pages/user/courseList/index.vue

@@ -84,9 +84,9 @@ export default {
             id: item.CourseId,
             title: item.CourseName,
             img: item.CourseImg,
-            remark: this.toolClass.dateFormat(item.BeginDate, 'yyyy-MM-dd') + '至' + this.toolClass.dateFormat(item.EndDate, 'yyyy-MM-dd'),
+            remark: this.toolClass.dateFormat(item.BeginDate, 'yyyy-MM-dd') + '-' + this.toolClass.dateFormat(item.EndDate, 'yyyy-MM-dd'),
             address: item.CaseAddress,
-            tag: '',
+            tag: item.CourseTags,
             courseType: '团体课',
             defaultPrice: item.Price + '/节',
             getWay: 'ticket',

src/pages/user/customization/customizationDetail.vue

@@ -4,10 +4,10 @@
       <img :src="topImg">
       <div>
         <div class="list">
-          <img :src='cover'>
+          <img :src="detail.ModelName === '黑色'?cover:cover2">
           <div>
             <div>云台天境台历定制</div>
-            <div>主办方: {{detail.CaseName}}</div>
+            <div>主办案场: {{detail.CaseName}}</div>
             <div>参与时间: {{toolClass.dateFormat(detail.CreateDate)}}</div>
           </div>
           <span>{{detail.MakeStatus === 'making' ? '制作中' : '制作完成'}}</span>
@@ -46,6 +46,7 @@
 
 <script>
 import cover from '@/common/icon/heise.png'
+import cover2 from '@/common/icon/honhse.png'
 import topImg from '@/common/icon/topImg.png'
 import { createNamespacedHelpers } from 'vuex'
 const { mapState: mapCustomizationState, mapActions: mapCustomizationActions } = createNamespacedHelpers('customization')
@@ -54,6 +55,7 @@ export default {
     return {
       topImg,
       cover,
+      cover2,
       showPage: false,
       showMore: false
     }
@@ -148,6 +150,7 @@ export default {
 .main {
   border-bottom: 0.1rem solid #f2f2f2;
   text-align: center;
+  background: #fff;
   .text {
     padding-bottom: 0.15rem;
   }
@@ -157,6 +160,7 @@ export default {
   }
 }
 .bottom {
+  background: #fff;
   .pic-list {
     padding: 0.05rem;
     box-sizing: border-box;

src/pages/user/customization/customizationList.vue

@@ -5,29 +5,37 @@
       v-for="(item,index) in list"
       :key="index"
       @click="toDetail(item.CustomerCalendarId)"
+      v-if="list.length>0"
     >
-      <img :src="cover">
+      <img :src="item.ModelName === '黑色'?cover:cover2">
       <div>
         <div>云台天境台历定制</div>
-        <div>主办方: {{item.CaseName}}</div>
+        <div>主办案场: {{item.CaseName}}</div>
         <div>参与时间: {{toolClass.dateFormat(item.CreateDate)}}</div>
       </div>
       <span>{{item.MakeStatus === 'making' ? '制作中' : '制作完成'}}</span>
     </div>
+    <noMore v-else></noMore>
   </div>
 </template>
 
 <script>
 import cover from '@/common/icon/heise.png'
+import cover2 from '@/common/icon/honhse.png'
+import noMore from '@/components/noMore/noMore.vue'
 import { createNamespacedHelpers } from 'vuex'
 const { mapState: mapCustomizationState, mapActions: mapCustomizationActions } = createNamespacedHelpers('customization')
 export default {
   data () {
     return {
       showPage: false,
-      cover
+      cover,
+      cover2
     }
   },
+  components:{
+    noMore
+  },
   created () {
     this.getList().then(() => {
       this.showPage = true
@@ -76,6 +84,7 @@ export default {
       div:nth-of-type(1) {
         color: #000;
         padding: 0px;
+        font-size: 0.15rem;
       }
       div:nth-of-type(2) {
         padding-top: 0.12rem;

src/pages/user/mainPage/indexPage/index.vue

@@ -29,13 +29,18 @@
     </div>
     <div class="areaHeader flex-h">
       <h1 class="flex-item">探索·发现</h1>
-      <router-link :to="{name: 'majorProjectsList'}">查看所有</router-link>
+      <router-link v-if="project.length>5" :to="{name: 'majorProjectsList'}">查看所有</router-link>
     </div>
     <div class="areaContent">
       <div class="scroll-h find">
         <div>
           <swiper :options="swiperHOption" ref="mySwiperH">
-            <swiper-slide class="swiper-slide" v-for="(item,index) in project" v-if="index<5" :key="index">
+            <swiper-slide
+              class="swiper-slide"
+              v-for="(item,index) in project"
+              v-if="index<5"
+              :key="index"
+            >
               <router-link
                 tag="div"
                 :to="{ name:'majorProjects', query:{ id: item.CmsCaseId } }"
@@ -54,13 +59,18 @@
     </div>
     <div class="areaHeader flex-h" v-if="courseList.length>0">
       <h1 class="flex-item">近期课程</h1>
-      <router-link :to="{name: 'courseList'}">查看所有</router-link>
+      <router-link v-show="courseList.length>5" :to="{name: 'courseList'}">查看所有</router-link>
     </div>
-    <div class="areaContent" :hidden="!courseList.length">
+    <div class="areaContent" v-if="courseList.length>0">
       <div class="scroll-h course">
         <div>
           <swiper :options="swiperHOption" ref="mySwiperH">
-            <swiper-slide class="swiper-slide" v-for="(item,index) in courseList" :key="index">
+            <swiper-slide
+              class="swiper-slide"
+              v-for="(item,index) in courseList"
+              :key="index"
+              v-if="index<5"
+            >
               <router-link
                 tag="div"
                 :to="{ name:'majorProjectsDetail', query:{ id: item.CourseId } }"
@@ -73,7 +83,7 @@
                 <div class="price">
                   <span>￥{{item.Price}}</span>
                 </div>
-                <span>{{toolClass.dateFormat(item.BeginDate)}}</span>
+                <span>{{`${toolClass.dateFormat(item.BeginDate,'yyyy-MM-dd')}~${toolClass.dateFormat(item.EndDate,'MM-dd')}`}}</span>
                 <span>{{item.CaseName}}</span>
               </router-link>
             </swiper-slide>
@@ -88,7 +98,13 @@
       <div class="flex-item">
         <div>
           <ul>
-            <li class="flex-h" v-for="(item,index) in newsList" :key="index" @click="jump(item)">
+            <li
+              class="flex-h"
+              v-for="(item,index) in newsList"
+              :key="index"
+              @click="jump(item)"
+              v-if="index<5"
+            >
               <a class="img">
                 <img :src="item.ImageUrl" class="centerLabel cover" alt>
               </a>
@@ -111,8 +127,6 @@ import { swiper, swiperSlide } from 'vue-awesome-swiper'
 import 'swiper/dist/css/swiper.css'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapState: mapIndexState, mapActions: mapIndexActions } = createNamespacedHelpers('index')
-const wx = require('weixin-js-sdk')
-import wxsdk from '@/util/share'
 export default {
   name: '',
   data () {
@@ -160,47 +174,33 @@ export default {
     swiperSlide
   },
   created () {
-    let that = this
-    wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
-      title: '城的空间',
-      desc: '城的空间',
-      link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
-      thu_image: `https://spaceofcheng.oss-cn-beijing.aliyuncs.com/indexlogo.jpg?x-oss-process=style/wxicon`
-    }).then(() => {
-      wx.getLocation({
-        type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
-        success: function (res) {
-          that.setLocation({ latitude1: res.latitude, longitude1: res.longitude })
-          that.getIndexLocation({ orgid: that.orgid, issys: '0' }).then((res) => {
-            // that.data.fiveA = that.fiveA
-            that.locationId = 'index'
-            that.getIndexInfo({ orgid: that.orgid, locationid: that.locationId }).then((res) => {
-              that.newsList = that.cms
-              if (that.project !== undefined && that.project !== null) {
-                for (let i = 0; i < that.project.length; i++) {
-                  if (that.project[i].CmsCaseImgs != null) {
-                    for (let j = 0; j < that.project[i].CmsCaseImgs.length; j++) {
-                      if (that.project[i].CmsCaseImgs[j].ImageType === 'cover') {
-                        that.project[i].CaseImageUrl = that.project[i].CmsCaseImgs[j].CaseImageUrl
-                      }
-                    }
-                  }
+    this.getIndexLocation({ orgid: this.orgid, issys: '0' }).then((res) => {
+      // this.data.fiveA = this.fiveA
+      this.locationId = 'index'
+      this.getIndexInfo({ orgid: this.orgid, locationid: this.locationId }).then((res) => {
+        this.newsList = this.cms
+        if (this.project !== undefined && this.project !== null) {
+          for (let i = 0; i < this.project.length; i++) {
+            if (this.project[i].CmsCaseImgs != null) {
+              for (let j = 0; j < this.project[i].CmsCaseImgs.length; j++) {
+                if (this.project[i].CmsCaseImgs[j].ImageType === 'cover') {
+                  this.project[i].CaseImageUrl = this.project[i].CmsCaseImgs[j].CaseImageUrl
                 }
               }
-            })
-            that.getCourseList({
-              pagesize: 5,
-              page: 1
-            }).then(() => {
-              that.showPage = true
-            })
-          })
+            }
+          }
         }
       })
+      this.getCourseList({
+        pagesize: 10000,
+        page: 1
+      }).then(() => {
+        this.showPage = true
+      })
     })
   },
   methods: {
-    ...mapIndexActions(['getIndexLocation', 'getIndexInfo', 'getCourseList', 'setLocation']),
+    ...mapIndexActions(['getIndexLocation', 'getIndexInfo', 'getCourseList']),
     jump (item) {
       item.ForwardType = item.ForwardType || ''
       if (item.ForwardType === 'url') {

src/pages/user/mainPage/indexPage/page.scss

@@ -83,7 +83,7 @@
           width: 100%;
           position: relative;
           .swiper-slide{
-            width: 1.15rem;
+            width: 1.14rem;
             height: .9rem;
             background: #eee;
             position: relative;
@@ -125,7 +125,7 @@
           width: 100%;
           position: relative;
           .swiper-slide{
-            width: 1.15rem;
+            width: 1.3rem;
             position: relative;
             overflow: visible;
             margin-right: .25rem;
@@ -134,7 +134,7 @@
             }
             .img{
               width: 100%;
-              padding-bottom: 100%;
+              padding-bottom: 1.66rem;
               background: #eee;
               border-radius: .1rem;
               position: relative;
@@ -147,13 +147,15 @@
                 left: 0;
                 top: 0;
                 font-size: .13rem;
-                font-weight: bolder;
                 top: .1rem;
                 text-indent: .1rem;
                 display: inline-block;
                 z-index: 2;
                 position: absolute;
                 color: #fff;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
               }
             }
             .price{
@@ -182,6 +184,7 @@
                 +span{
                   line-height: .2rem;
                   font-size: .13rem;
+                  display: block;
                 }
               }
             }

src/pages/user/majorProjectsList/index.vue

@@ -33,10 +33,7 @@
 </template>
 
 <script>
-import { mapState, createNamespacedHelpers } from 'vuex'
-const { mapActions: mapIndexActions } = createNamespacedHelpers('index')
-const wx = require('weixin-js-sdk')
-import wxsdk from '@/util/share'
+import { mapState } from 'vuex'
 export default {
   name: '',
   data () {
@@ -45,35 +42,8 @@ export default {
   },
   computed: {
     ...mapState({
-      orgid: x => x.app.orgId,
       project: x => x.index.project
     })
-  },
-  components: {
-  },
-  created () {
-    let that = this
-    wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
-      title: '城的空间',
-      desc: '城的空间',
-      link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
-      thu_image: `https://spaceofcheng.oss-cn-beijing.aliyuncs.com/indexlogo.jpg?x-oss-process=style/wxicon`
-    }).then(() => {
-      wx.getLocation({
-        type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
-        success: function (res) {
-          that.setLocation({ latitude1: res.latitude, longitude1: res.longitude })
-          that.getProjectList({
-            orgid: that.orgid
-          }).then(() => {
-            console.log(that.project)
-          })
-        }
-      })
-    })
-  },
-  methods: {
-    ...mapIndexActions(['getProjectList', 'setLocation'])
   }
 }
 </script>

src/pages/user/majorProjectsList/page.scss

@@ -21,7 +21,7 @@
             padding: .03rem 0;
             border-bottom: 1px solid #ededed;
             img{
-              width: 1.15rem;
+              width: 1.14rem;
               height: .9rem;
               position: relative;
               overflow: hidden;

src/store/index/index.js

@@ -118,8 +118,13 @@ export default {
       let arr = []
       let dataNew = []
       data.forEach((item) => {
-        item.jl = parseInt(toolClass.getGreatCircleDistance(state.latitude1, state.longitude1, item.Coordinate.split(',')[0], item.Coordinate.split(',')[1]))
-        arr.push(parseInt(toolClass.getGreatCircleDistance(state.latitude1, state.longitude1, item.Coordinate.split(',')[0], item.Coordinate.split(',')[1])))
+        if (item.Coordinate) {
+          item.jl = parseInt(toolClass.getGreatCircleDistance(state.latitude1, state.longitude1, item.Coordinate.split(',')[0], item.Coordinate.split(',')[1]))
+          arr.push(parseInt(toolClass.getGreatCircleDistance(state.latitude1, state.longitude1, item.Coordinate.split(',')[0], item.Coordinate.split(',')[1])))
+        } else {
+          item.jl = 400000000
+          arr.push(400000000)
+        }
       })
       arr.sort((a, b) => { return a - b })
       arr.forEach((curr) => {

src/store/making/index.js

@@ -47,8 +47,9 @@ export default {
       {
         bgImg: coverBlack,
         defaultBg: '',
-        CalendarImg: coverBlack,
+        CalendarImg: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/coverBlack.jpg',
         CustomerImg: '',
+        defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/coverBlack.jpg',
         ImgName: '封面',
         Sort: 1,
         style: ''
@@ -56,9 +57,9 @@ export default {
       {
         bgImg: b1bg,
         defaultBg: b1,
-        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543546637',
+        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/96917dcd-ed9f-446b-b54d-d2160416cf1a-20181205094151.jpg',
         CustomerImg: '',
-        defaultNoUser:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b1.jpg',
+        defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b1.jpg',
         ImgName: '1月',
         Sort: 2,
         style: 'width:1.44rem;height:.94rem;position:absolute;top:.25rem;left:50%;transform:translateX(-50%);object-fit: cover;',
@@ -67,9 +68,9 @@ export default {
       {
         bgImg: b2bg,
         defaultBg: b2,
-        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543547849',
+        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/dd3e0c2d-5ea4-47d5-84b7-c1259ddf9cf1-20181205094235.jpg',
         CustomerImg: '',
-        defaultNoUser:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b2.jpg',
+        defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b2.jpg',
         ImgName: '2月',
         Sort: 3,
         style: 'width:1.01rem;height:1.18rem;position:absolute;top:.23rem;left:0.15rem;object-fit: cover;',
@@ -78,9 +79,9 @@ export default {
       {
         bgImg: b3bg,
         defaultBg: b3,
-        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543546638',
+        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/3a24c0c3-694f-4af2-aa09-0287eb0110fd-20181205094257.jpg',
         CustomerImg: '',
-        defaultNoUser:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b3.jpg',
+        defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b3.jpg',
         ImgName: '3月',
         Sort: 4,
         style: 'width:1.01rem;height:1.18rem;position:absolute;top:.23rem;right:0.16rem;object-fit: cover;',
@@ -89,9 +90,9 @@ export default {
       {
         bgImg: b4bg,
         defaultBg: b4,
-        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543547851',
+        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/b387debc-dc6b-4864-8d26-ce41c2702f1a-20181205094322.jpg',
         CustomerImg: '',
-        defaultNoUser:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b4.jpg',
+        defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b4.jpg',
         ImgName: '4月',
         Sort: 5,
         style: 'width:1.44rem;height:.94rem;position:absolute;top:.24rem;left:50%;transform:translateX(-50.5%);object-fit: cover;',
@@ -100,9 +101,9 @@ export default {
       {
         bgImg: b5bg,
         defaultBg: b5,
-        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543546640',
+        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/c5b51b42-078d-414b-8cb8-5b5daf6e5463-20181205094344.jpg',
         CustomerImg: '',
-        defaultNoUser:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b5.jpg',
+        defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b5.jpg',
         ImgName: '5月',
         Sort: 6,
         style: 'width:1.01rem;height:1.18rem;position:absolute;top:.23rem;left:0.15rem;object-fit: cover;',
@@ -111,9 +112,9 @@ export default {
       {
         bgImg: b6bg,
         defaultBg: b6,
-        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543546642',
+        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/8b6a3cb2-23d2-4993-b84b-308e9b302cda-20181205094359.jpg',
         CustomerImg: '',
-        defaultNoUser:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b6.jpg',
+        defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b6.jpg',
         ImgName: '6月',
         Sort: 7,
         style: 'width:1.01rem;height:1.18rem;position:absolute;top:.24rem;right:0.16rem;object-fit: cover;',
@@ -122,9 +123,9 @@ export default {
       {
         bgImg: b7bg,
         defaultBg: b7,
-        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543546643',
+        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/11a72196-3ca1-4759-88c3-6b4317928857-20181205094421.jpg',
         CustomerImg: '',
-        defaultNoUser:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b7.jpg',
+        defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b7.jpg',
         ImgName: '7月',
         Sort: 8,
         style: 'width:1.44rem;height:.94rem;position:absolute;top:.24rem;left:50%;transform:translateX(-50%);object-fit: cover;',
@@ -133,9 +134,9 @@ export default {
       {
         bgImg: b8bg,
         defaultBg: b8,
-        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543546644',
+        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/0d563fa7-7a5c-46fe-bddc-dbb9cdfba160-20181205094436.jpg',
         CustomerImg: '',
-        defaultNoUser:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b8.jpg',
+        defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b8.jpg',
         ImgName: '8月',
         Sort: 9,
         style: 'width:1.01rem;height:1.18rem;position:absolute;top:.2rem;left:0.17rem;object-fit: cover;',
@@ -144,9 +145,9 @@ export default {
       {
         bgImg: b9bg,
         defaultBg: b9,
-        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543546645',
+        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/44f83cc7-f57b-472d-b65b-84b5b10babc7-20181205094453.jpg',
         CustomerImg: '',
-        defaultNoUser:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b9.jpg',
+        defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b9.jpg',
         ImgName: '9月',
         Sort: 10,
         style: 'width:1.01rem;height:1.18rem;position:absolute;top:.2rem;right:0.16rem;object-fit: cover;',
@@ -155,9 +156,9 @@ export default {
       {
         bgImg: b10bg,
         defaultBg: b10,
-        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543546646',
+        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/6cf9a507-87c2-47f9-ad15-990032ecdaac-20181205094510.jpg',
         CustomerImg: '',
-        defaultNoUser:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b10.jpg',
+        defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b10.jpg',
         ImgName: '10月',
         Sort: 11,
         style: 'width:1.44rem;height:.94rem;position:absolute;top:.24rem;left:50%;transform:translateX(-50%);object-fit: cover;',
@@ -166,9 +167,9 @@ export default {
       {
         bgImg: b11bg,
         defaultBg: b11,
-        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543546647',
+        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/2e8d2090-c528-4f37-8964-201a638e17ed-20181205094529.jpg',
         CustomerImg: '',
-        defaultNoUser:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b11.jpg',
+        defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b11.jpg',
         ImgName: '11月',
         Sort: 12,
         style: 'width:1.01rem;height:1.18rem;position:absolute;top:.2rem;left:0.16rem;object-fit: cover;',
@@ -177,9 +178,9 @@ export default {
       {
         bgImg: b12bg,
         defaultBg: b12,
-        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543546648',
+        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/e36c0bd2-5a48-42f0-86c6-99a56bb27210-20181205094545.jpg',
         CustomerImg: '',
-        defaultNoUser:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b12.jpg',
+        defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b12.jpg',
         ImgName: '12月',
         Sort: 13,
         style: 'width:1.01rem;height:1.18rem;position:absolute;top:.2rem;right:0.16rem;object-fit: cover;',
@@ -190,8 +191,9 @@ export default {
       {
         bgImg: coverRed,
         defaultBg: '',
-        CalendarImg: coverRed,
+        CalendarImg: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/coverRed.jpg',
         CustomerImg: '',
+        defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/coverRed.jpg',
         ImgName: '封面',
         Sort: 1,
         style: ''
@@ -199,9 +201,9 @@ export default {
       {
         bgImg: r1bg,
         defaultBg: b1,
-        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543557398',
+        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/de1214b4-2984-4d42-b224-66ea4f199b83-20181205094956.jpg',
         CustomerImg: '',
-        defaultNoUser:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b1.jpg',
+        defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b1.jpg',
         ImgName: '1月',
         Sort: 2,
         style: 'width:1.44rem;height:.94rem;position:absolute;top:.25rem;left:50%;transform:translateX(-50%);object-fit: cover;',
@@ -210,9 +212,9 @@ export default {
       {
         bgImg: r2bg,
         defaultBg: b2,
-        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543556811',
+        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/c5d961ed-6a8e-401a-b371-19e3c7be070a-20181205095012.jpg',
         CustomerImg: '',
-        defaultNoUser:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b2.jpg',
+        defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b2.jpg',
         ImgName: '2月',
         Sort: 3,
         style: 'width:1.01rem;height:1.18rem;position:absolute;top:.23rem;left:0.15rem;object-fit: cover;',
@@ -221,9 +223,9 @@ export default {
       {
         bgImg: r3bg,
         defaultBg: b3,
-        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543557399',
+        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/390afecc-e7f9-4643-beaf-e696de93f2bf-20181205095032.jpg',
         CustomerImg: '',
-        defaultNoUser:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b3.jpg',
+        defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b3.jpg',
         ImgName: '3月',
         Sort: 4,
         style: 'width:1.01rem;height:1.18rem;position:absolute;top:.23rem;right:0.16rem;object-fit: cover;',
@@ -232,9 +234,9 @@ export default {
       {
         bgImg: r4bg,
         defaultBg: b4,
-        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543557400',
+        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/52015d95-f4a3-44bc-9650-79750c3a8a55-20181205095057.jpg',
         CustomerImg: '',
-        defaultNoUser:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b4.jpg',
+        defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b4.jpg',
         ImgName: '4月',
         Sort: 5,
         style: 'width:1.44rem;height:.94rem;position:absolute;top:.24rem;left:50%;transform:translateX(-50.5%);object-fit: cover;',
@@ -243,9 +245,9 @@ export default {
       {
         bgImg: r5bg,
         defaultBg: b5,
-        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543556813',
+        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/2ea3e866-151b-4a38-8899-778113672e4b-20181205095118.jpg',
         CustomerImg: '',
-        defaultNoUser:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b5.jpg',
+        defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b5.jpg',
         ImgName: '5月',
         Sort: 6,
         style: 'width:1.01rem;height:1.18rem;position:absolute;top:.23rem;left:0.15rem;object-fit: cover;',
@@ -254,9 +256,9 @@ export default {
       {
         bgImg: r6bg,
         defaultBg: b6,
-        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543556814',
+        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/23c4e345-addf-40cd-b383-658f2a998367-20181205095139.jpg',
         CustomerImg: '',
-        defaultNoUser:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b6.jpg',
+        defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b6.jpg',
         ImgName: '6月',
         Sort: 7,
         style: 'width:1.01rem;height:1.18rem;position:absolute;top:.24rem;right:0.16rem;object-fit: cover;',
@@ -265,9 +267,9 @@ export default {
       {
         bgImg: r7bg,
         defaultBg: b7,
-        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543560521',
+        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/f686a7cd-b7d1-4501-aaad-177c10377618-20181205095200.jpg',
         CustomerImg: '',
-        defaultNoUser:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b7.jpg',
+        defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b7.jpg',
         ImgName: '7月',
         Sort: 8,
         style: 'width:1.44rem;height:.94rem;position:absolute;top:.24rem;left:50%;transform:translateX(-50%);object-fit: cover;',
@@ -276,9 +278,9 @@ export default {
       {
         bgImg: r8bg,
         defaultBg: b8,
-        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543556815',
+        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/04d53ced-f552-4986-8f53-8ddc52f2ea9f-20181205095229.jpg',
         CustomerImg: '',
-        defaultNoUser:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b8.jpg',
+        defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b8.jpg',
         ImgName: '8月',
         Sort: 9,
         style: 'width:1.01rem;height:1.18rem;position:absolute;top:.2rem;left:0.17rem;object-fit: cover;',
@@ -287,9 +289,9 @@ export default {
       {
         bgImg: r9bg,
         defaultBg: b9,
-        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543557403',
+        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/e8c6cf08-9036-4e50-9c2f-4ebc5d79f4d5-20181205095248.jpg',
         CustomerImg: '',
-        defaultNoUser:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b9.jpg',
+        defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b9.jpg',
         ImgName: '9月',
         Sort: 10,
         style: 'width:1.01rem;height:1.18rem;position:absolute;top:.2rem;right:0.16rem;object-fit: cover;',
@@ -298,9 +300,9 @@ export default {
       {
         bgImg: r10bg,
         defaultBg: b10,
-        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543556816',
+        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/2c5cceb6-f418-4e49-bba6-bbd9f36eec2c-20181205095306.jpg',
         CustomerImg: '',
-        defaultNoUser:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b10.jpg',
+        defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b10.jpg',
         ImgName: '10月',
         Sort: 11,
         style: 'width:1.44rem;height:.94rem;position:absolute;top:.24rem;left:50%;transform:translateX(-50%);object-fit: cover;',
@@ -309,9 +311,9 @@ export default {
       {
         bgImg: r11bg,
         defaultBg: b11,
-        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543556817',
+        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/e471c47e-2142-47e1-ad26-abe87af7b168-20181205095320.jpg',
         CustomerImg: '',
-        defaultNoUser:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b11.jpg',
+        defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b11.jpg',
         ImgName: '11月',
         Sort: 12,
         style: 'width:1.01rem;height:1.18rem;position:absolute;top:.2rem;left:0.16rem;object-fit: cover;',
@@ -320,9 +322,9 @@ export default {
       {
         bgImg: r12bg,
         defaultBg: b12,
-        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543556818',
+        CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/0592e7b4-f7c5-44dd-a557-e20b282e60ca-20181205095342.jpg',
         CustomerImg: '',
-        defaultNoUser:'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b12.jpg',
+        defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b12.jpg',
         ImgName: '12月',
         Sort: 13,
         style: 'width:1.01rem;height:1.18rem;position:absolute;top:.2rem;right:0.16rem;object-fit: cover;',

src/util/ajax.js

@@ -21,6 +21,7 @@ const Axios = axios.create({
   withCredentials: true,
   queryData: {},
   urlData: {},
+  headerData: '',
   headers: {
     'Content-Type': 'multipart/form-data',
     'authorization': token()
@@ -29,6 +30,7 @@ const Axios = axios.create({
 
 Axios.interceptors.request.use((config) => {
   config.headers.authorization = token()
+  config.headers['Content-Type'] = config.headerData ? config.headerData : 'multipart/form-data'
   // config.urlData = { ...config.urlData,  }
   // 处理请求data,若为get请求，拼到url后面，若为post请求，直接添加到body中
   let urlData = qs.stringify(config.urlData)
@@ -44,18 +46,22 @@ Axios.interceptors.request.use((config) => {
   if (queryData) {
     config.url += '?' + queryData
   }
-  let fm = new FormData()
-  for (let k in config.data) {
-    if (Array.isArray(config.data[k])) {
-      config.data[k].forEach((v) => {
-        fm.append(k, v)
-      })
-    } else {
-      fm.append(k, config.data[k])
+  if (config.headerData) {
+    return config
+  } else {
+    let fm = new FormData()
+    for (let k in config.data) {
+      if (Array.isArray(config.data[k])) {
+        config.data[k].forEach((v) => {
+          fm.append(k, v)
+        })
+      } else {
+        fm.append(k, config.data[k])
+      }
     }
+    config.data = fm
+    return config
   }
-  config.data = fm
-  return config
 }, (error) => {
   console.log(error)
 })
@@ -81,7 +87,7 @@ const ajax = (...args) => {
       } else if (code === 405) {
         // console.log(router.history.current.name)
         // if (router.history.current.name !== 'bindMobile') {
-          router.push({ name: 'login' })
+        router.push({ name: 'login' })
         // }
       } else {
         if (message.indexOf("log-error") != -1) {

src/util/api.js

@@ -9,6 +9,10 @@ const $api = {
     image: { // 图片上传
       method: 'post',
       url: `${baseUrl}${common}/file`
+    },
+    base64: {
+      method: 'post',
+      url: `${baseUrl}${common}/file/base64`
     }
   },
   index: { // 首页

src/util/util.js

@@ -80,6 +80,33 @@ const toolClass = {
         resolve(result)
       }).catch(reject)
     })
+  },
+  uploadGzip (obj) {
+    return new Promise((resolve, reject) => {
+      Ajax({
+        ...api.file.image,
+        headerData: obj.header,
+        data: obj.gzip,
+      }).then((res) => {
+        resolve(res)
+      }).catch(reject)
+    })
+  },
+  uploadBase64 (base64) {
+    return new Promise((resolve, reject) => {
+      Ajax({
+        ...api.file.base64,
+        queryData: {
+          namestr: base64.namestr
+        },
+        data: { base64str: base64.base64str },
+      }).then((res) => {
+        let result = {
+          result: res
+        }
+        resolve(result)
+      }).catch(reject)
+    })
   }
 }