ytj

package.json

@@ -29,6 +29,7 @@
     "sass-loader": "^7.1.0",
     "vant": "^1.3.0",
     "vue-awesome-swiper": "^3.1.3",
+    "vue-croppa": "^1.3.8",
     "vue-router": "^3.0.1",
     "vue-template-compiler": "^2.5.17",
     "vuex": "^3.0.1",

src/pages/user/bindMobile/bindMobile.vue

@@ -23,7 +23,7 @@
         </div>-->
         <div class="mobile">
           <i class="iconfont icon-zhanghu"></i>
-          <input type="tel" placeholder="真实姓名" v-model="postData.name">
+          <input placeholder="真实姓名" v-model="postData.name">
         </div>
 
         <div class="mobile">

src/pages/user/calendar/calendar.vue

@@ -34,7 +34,8 @@ export default {
   data () {
     return {
       topImg,
-      state: 1
+      state: 1,
+      endTime: "2018/12/22 00:00:00"
     }
   },
   created () {
@@ -43,8 +44,7 @@ export default {
         if (res) {
           this.state = 2
         } else {
-          let stringTime = "2018-12-22 00:00:00"
-          let timestamp = Date.parse(new Date(stringTime))
+          let timestamp = new Date(this.endTime).getTime()
           let now = new Date().getTime()
           if (timestamp >= now) {
             this.state = 1

src/pages/user/calendar/making.vue

@@ -216,6 +216,10 @@ export default {
         delete curr['defaultBg']
         delete curr['style']
         delete curr['styleCut']
+        if (!curr['CustomerImg']) {
+          curr['CustomerImg'] = curr['defaultNoUser']
+        }
+        delete curr['defaultNoUser']
       });
       let submitData = {
         ModelName: this.$route.query.type == 1 ? '黑色' : '红色',
@@ -346,7 +350,7 @@ export default {
 .pop-box {
   width: 100%;
   height: 100%;
-  position: fixed;
+  position: absolute;
   left: 0;
   top: 0;
   display: flex;

src/store/making/index.js

@@ -58,6 +58,7 @@ export default {
         defaultBg: b1,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543546637',
         CustomerImg: '',
+        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;',
@@ -68,6 +69,7 @@ export default {
         defaultBg: b2,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543547849',
         CustomerImg: '',
+        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,6 +80,7 @@ export default {
         defaultBg: b3,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543546638',
         CustomerImg: '',
+        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;',
@@ -88,6 +91,7 @@ export default {
         defaultBg: b4,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543547851',
         CustomerImg: '',
+        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;',
@@ -98,6 +102,7 @@ export default {
         defaultBg: b5,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543546640',
         CustomerImg: '',
+        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;',
@@ -108,6 +113,7 @@ export default {
         defaultBg: b6,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543546642',
         CustomerImg: '',
+        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;',
@@ -118,6 +124,7 @@ export default {
         defaultBg: b7,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543546643',
         CustomerImg: '',
+        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;',
@@ -128,6 +135,7 @@ export default {
         defaultBg: b8,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543546644',
         CustomerImg: '',
+        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;',
@@ -138,6 +146,7 @@ export default {
         defaultBg: b9,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543546645',
         CustomerImg: '',
+        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;',
@@ -148,6 +157,7 @@ export default {
         defaultBg: b10,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543546646',
         CustomerImg: '',
+        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;',
@@ -158,6 +168,7 @@ export default {
         defaultBg: b11,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543546647',
         CustomerImg: '',
+        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;',
@@ -168,6 +179,7 @@ export default {
         defaultBg: b12,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543546648',
         CustomerImg: '',
+        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;',
@@ -189,6 +201,7 @@ export default {
         defaultBg: b1,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543557398',
         CustomerImg: '',
+        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;',
@@ -199,6 +212,7 @@ export default {
         defaultBg: b2,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543556811',
         CustomerImg: '',
+        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;',
@@ -209,6 +223,7 @@ export default {
         defaultBg: b3,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543557399',
         CustomerImg: '',
+        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;',
@@ -219,6 +234,7 @@ export default {
         defaultBg: b4,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543557400',
         CustomerImg: '',
+        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;',
@@ -229,6 +245,7 @@ export default {
         defaultBg: b5,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543556813',
         CustomerImg: '',
+        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;',
@@ -239,6 +256,7 @@ export default {
         defaultBg: b6,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543556814',
         CustomerImg: '',
+        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;',
@@ -249,6 +267,7 @@ export default {
         defaultBg: b7,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543560521',
         CustomerImg: '',
+        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;',
@@ -259,6 +278,7 @@ export default {
         defaultBg: b8,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543556815',
         CustomerImg: '',
+        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;',
@@ -269,6 +289,7 @@ export default {
         defaultBg: b9,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543557403',
         CustomerImg: '',
+        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;',
@@ -279,6 +300,7 @@ export default {
         defaultBg: b10,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543556816',
         CustomerImg: '',
+        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;',
@@ -289,6 +311,7 @@ export default {
         defaultBg: b11,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543556817',
         CustomerImg: '',
+        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;',
@@ -299,6 +322,7 @@ export default {
         defaultBg: b12,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/blob1543556818',
         CustomerImg: '',
+        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;',