yuantianjiao 6 년 전
부모
커밋
7a714718c6

+ 4
- 4
src/pages/user/calendar/calendar.vue 파일 보기

@@ -4,8 +4,8 @@
4 4
       <img :src="topImg" alt>
5 5
     </div>
6 6
     <div class="middle">
7
-      <p>云台天境 定制您的2019私人专属台历</p>
8
-      <span>时间: 2018年12月12日-2018年12月19日</span>
7
+      <p>云台天境 定制您的2019专属台历</p>
8
+      <span>时间: 2018年12月11日-2018年12月18日</span>
9 9
       <span>地点: 江宁区云台山河路1号云台天境售楼处</span>
10 10
     </div>
11 11
     <div class="bottom">
@@ -37,8 +37,8 @@ export default {
37 37
     return {
38 38
       topImg,
39 39
       state: 1,
40
-      startTime: "2018/12/12 00:00:00",
41
-      endTime: "2018/12/19 23:59:59"
40
+      startTime: "2018/12/11 00:00:00",
41
+      endTime: "2018/12/18 23:59:59"
42 42
     }
43 43
   },
44 44
   created () {

+ 15
- 12
src/pages/user/calendar/making.vue 파일 보기

@@ -172,6 +172,7 @@ export default {
172 172
     },
173 173
     email: {
174 174
       get () {
175
+        console.log(this.Email)
175 176
         return this.Email
176 177
       },
177 178
       set (val) {
@@ -189,7 +190,7 @@ export default {
189 190
   methods: {
190 191
     ...mapMakingActions(['setBanner', 'calendar', 'setEmail']),
191 192
     upload (url) {
192
-      this.banner[this.mainIndex - 1].CustomerImg = url
193
+      this.banner[this.mainIndex - 1].CustomerImg = url + '?x-oss-process=style/calendar-thumb'
193 194
       this.setBanner({ type: this.$route.query.type, data: JSON.parse(JSON.stringify(this.banner)) }).then(() => {
194 195
         this.calSize().then(() => {
195 196
           let cutDoms = document.getElementsByClassName('cutDom')[0]
@@ -200,18 +201,18 @@ export default {
200 201
           })
201 202
         })
202 203
       })
203
-    },  
204
+    },
204 205
     emailBlur () {
205
-      var currentPosition,timer;
206
-      var speed=1;//页面滚动距离
207
-      timer=setInterval(function(){
208
-          currentPosition=document.documentElement.scrollTop || document.body.scrollTop;
209
-          currentPosition-=speed; 
210
-          window.scrollTo(0,currentPosition);//页面向上滚动
211
-          currentPosition+=speed; //speed变量
212
-          window.scrollTo(0,currentPosition);//页面向下滚动
213
-          clearInterval(timer);
214
-      },1);
206
+      var currentPosition, timer;
207
+      var speed = 1;//页面滚动距离
208
+      timer = setInterval(function () {
209
+        currentPosition = document.documentElement.scrollTop || document.body.scrollTop;
210
+        currentPosition -= speed;
211
+        window.scrollTo(0, currentPosition);//页面向上滚动
212
+        currentPosition += speed; //speed变量
213
+        window.scrollTo(0, currentPosition);//页面向下滚动
214
+        clearInterval(timer);
215
+      }, 1);
215 216
     },
216 217
     onRead (file) {
217 218
       let that = this
@@ -278,6 +279,8 @@ export default {
278 279
         delete curr['styleCut']
279 280
         if (!curr.CustomerImg) {
280 281
           curr.CustomerImg = curr.defaultNoUser
282
+        } else {
283
+          curr.CustomerImg.replace('?x-oss-process=style/calendar-thumb', '')
281 284
         }
282 285
         delete curr['defaultNoUser']
283 286
         delete curr['CustomerImgShow']

+ 1
- 1
src/pages/user/customization/customizationDetail.vue 파일 보기

@@ -6,7 +6,7 @@
6 6
         <div class="list">
7 7
           <img :src="detail.ModelName === '黑色'?cover:cover2">
8 8
           <div>
9
-            <div>云台天境台历定制</div>
9
+            <div>云台天境 定制您的2019专属台历</div>
10 10
             <div>主办案场: {{detail.CaseName}}</div>
11 11
             <div>参与时间: {{toolClass.dateFormat(detail.CreateDate)}}</div>
12 12
           </div>

+ 1
- 1
src/pages/user/customization/customizationList.vue 파일 보기

@@ -8,7 +8,7 @@
8 8
     >
9 9
       <img :src="item.ModelName === '黑色'?cover:cover2">
10 10
       <div>
11
-        <div>云台天境台历定制</div>
11
+        <div>云台天境 定制您的2019专属台历</div>
12 12
         <div>主办案场: {{item.CaseName}}</div>
13 13
         <div>参与时间: {{toolClass.dateFormat(item.CreateDate)}}</div>
14 14
       </div>

+ 3
- 1
src/store/making/index.js 파일 보기

@@ -355,7 +355,8 @@ export default {
355 355
         style: 'width:1.01rem;height:1.18rem;position:absolute;top:.2rem;right:0.16rem;object-fit:cover;',
356 356
         styleCut: `width: 7.83cm;height: 9.16cm;position: absolute;top: 1.56cm;right: 1.15cm;`
357 357
       }
358
-    ]
358
+    ],
359
+    email: ''
359 360
   },
360 361
   mutations: {
361 362
     upDateBanner (state, { type, data }) {
@@ -382,6 +383,7 @@ export default {
382 383
     },
383 384
     setEmail (context, data) {
384 385
       return new Promise((resolve) => {
386
+        console.log(data)
385 387
         context.commit('upDateEmail', data)
386 388
         resolve()
387 389
       })