yuantianjiao 6 年之前
父節點
當前提交
8513760945

+ 2
- 2
public/index.html 查看文件

9
   <link rel="stylesheet" href="//at.alicdn.com/t/font_775069_clu263vfyod.css">
9
   <link rel="stylesheet" href="//at.alicdn.com/t/font_775069_clu263vfyod.css">
10
   <link rel="icon" href="<%= BASE_URL %>favicon.ico">
10
   <link rel="icon" href="<%= BASE_URL %>favicon.ico">
11
   <!-- <script src="https://jsconsole.com/js/remote.js?34f890f2-39c4-46f7-9d9e-7a8cb29a6007"></script> -->
11
   <!-- <script src="https://jsconsole.com/js/remote.js?34f890f2-39c4-46f7-9d9e-7a8cb29a6007"></script> -->
12
-  <script src="//cdn.bootcss.com/eruda/1.5.2/eruda.min.js"></script>
13
-  <script>eruda.init();</script>
12
+  <!-- <script src="//cdn.bootcss.com/eruda/1.5.2/eruda.min.js"></script>
13
+  <script>eruda.init();</script> -->
14
   <title>
14
   <title>
15
     <%= htmlWebpackPlugin.options.title %>
15
     <%= htmlWebpackPlugin.options.title %>
16
   </title>
16
   </title>

+ 1
- 0
src/components/orderItem/page.scss 查看文件

1
 .orderItem{
1
 .orderItem{
2
+  padding: .15rem 0;
2
   .img{
3
   .img{
3
     width: .72rem;
4
     width: .72rem;
4
     position: relative;
5
     position: relative;

+ 1
- 1
src/pages/user/calendar/calendar.vue 查看文件

10
     </div>
10
     </div>
11
     <div class="bottom">
11
     <div class="bottom">
12
       <p class="title">活动详情</p>
12
       <p class="title">活动详情</p>
13
-      <div>用户在线上传照片生成2019年台历,可通过填写邮箱,获得电子版台历(1个工作日内)。</div>
13
+      <div>用户在线上传照片(最少3张)生成2019年台历,可通过填写邮箱,获得电子版台历(1个工作日内)。</div>
14
       <div>前200名上传成功用户,可在关注【城的空间】公众号接到推送或接到短信通知后来云台天境售楼处领取精美实物台历一份。</div>
14
       <div>前200名上传成功用户,可在关注【城的空间】公众号接到推送或接到短信通知后来云台天境售楼处领取精美实物台历一份。</div>
15
       <div>活动电话:025-86426666</div>
15
       <div>活动电话:025-86426666</div>
16
       <div>服务案场:银城旭辉云台天境</div>
16
       <div>服务案场:银城旭辉云台天境</div>

+ 9
- 3
src/pages/user/calendar/making.vue 查看文件

57
         <div class="swiper-pagination"></div>
57
         <div class="swiper-pagination"></div>
58
       </div>
58
       </div>
59
       <div class="meassage" v-if="mainIndex !== 1">备注:为了美观效果请上传{{size}}尺寸照片,未按尺寸会默认裁剪</div>
59
       <div class="meassage" v-if="mainIndex !== 1">备注:为了美观效果请上传{{size}}尺寸照片,未按尺寸会默认裁剪</div>
60
-      <div class="meassage" v-else>&nbsp;</div>
60
+      <div class="meassage" v-else>左右滑动可上传自定义图片</div>
61
       <div class="operation">
61
       <div class="operation">
62
         <div>
62
         <div>
63
           <van-uploader :after-read="onRead" v-show="mainIndex !== 1">
63
           <van-uploader :after-read="onRead" v-show="mainIndex !== 1">
217
     onRead (file) {
217
     onRead (file) {
218
       let that = this
218
       let that = this
219
       this.isLoading = true
219
       this.isLoading = true
220
+      let reg = /^[0-9a-zA-Z.]+$/
221
+      if (!reg.test(file.file.name)) {
222
+        this.$toast('图片名称中包含非法字符')
223
+        this.isLoading = false
224
+        return
225
+      }
220
       let reader = new FileReader();
226
       let reader = new FileReader();
221
       reader.readAsDataURL(file.file);
227
       reader.readAsDataURL(file.file);
222
       reader.onload = function (e) {
228
       reader.onload = function (e) {
280
         if (!curr.CustomerImg) {
286
         if (!curr.CustomerImg) {
281
           curr.CustomerImg = curr.defaultNoUser
287
           curr.CustomerImg = curr.defaultNoUser
282
         } else {
288
         } else {
283
-          curr.CustomerImg.replace('?x-oss-process=style/calendar-thumb', '')
289
+          curr.CustomerImg = curr.CustomerImg.replace('?x-oss-process=style/calendar-thumb', '')
284
         }
290
         }
285
         delete curr['defaultNoUser']
291
         delete curr['defaultNoUser']
286
         delete curr['CustomerImgShow']
292
         delete curr['CustomerImgShow']
292
         Imgs: data
298
         Imgs: data
293
       }
299
       }
294
       this.calendar({ Calendar: JSON.stringify(submitData) }).then(() => {
300
       this.calendar({ Calendar: JSON.stringify(submitData) }).then(() => {
295
-        this.$toast('日历已生成')
301
+        this.$toast('活动参与成功')
296
         this.$router.replace({ name: 'userCenter' })
302
         this.$router.replace({ name: 'userCenter' })
297
       })
303
       })
298
     },
304
     },

+ 19
- 2
src/pages/user/customization/customizationDetail.vue 查看文件

6
         <div class="list">
6
         <div class="list">
7
           <img :src="detail.ModelName === '黑色'?cover:cover2">
7
           <img :src="detail.ModelName === '黑色'?cover:cover2">
8
           <div>
8
           <div>
9
-            <div>云台天境 定制您的2019专属台历</div>
9
+            <div>定制您的2019专属台历</div>
10
             <div>主办案场: {{detail.CaseName}}</div>
10
             <div>主办案场: {{detail.CaseName}}</div>
11
             <div>参与时间: {{toolClass.dateFormat(detail.CreateDate)}}</div>
11
             <div>参与时间: {{toolClass.dateFormat(detail.CreateDate)}}</div>
12
           </div>
12
           </div>
27
           :src="item.CalendarImg"
27
           :src="item.CalendarImg"
28
           :key="index"
28
           :key="index"
29
           v-if="showMore || index < 4"
29
           v-if="showMore || index < 4"
30
+          @click="large(item.CalendarImg)"
30
         >
31
         >
31
       </div>
32
       </div>
32
       <div v-if="!showMore" @click="more()" class="more">
33
       <div v-if="!showMore" @click="more()" class="more">
39
       </div>
40
       </div>
40
     </div>
41
     </div>
41
     <div class="foot">
42
     <div class="foot">
42
-      <div>联系我们: 025-86426666</div>
43
+      <div @click="tel()">联系我们: 025-86426666</div>
43
     </div>
44
     </div>
44
   </div>
45
   </div>
45
 </template>
46
 </template>
79
     },
80
     },
80
     noMore () {
81
     noMore () {
81
       this.showMore = false
82
       this.showMore = false
83
+    },
84
+    large (src) {
85
+      let list = []
86
+      this.detail.Imgs.forEach(item => {
87
+        list.push(item.CalendarImg)
88
+      });
89
+      WeixinJSBridge.invoke('imagePreview', {
90
+        'current': src,
91
+        'urls': list
92
+      })
93
+    },
94
+    tel () {
95
+      window.location.href = 'tel:02586426666'
82
     }
96
     }
83
   }
97
   }
84
 }
98
 }
195
   text-align: center;
209
   text-align: center;
196
   line-height: 0.9rem;
210
   line-height: 0.9rem;
197
   background: #f2f2f2;
211
   background: #f2f2f2;
212
+  div {
213
+    color: #77a5f0;
214
+  }
198
 }
215
 }
199
 </style>
216
 </style>

+ 1
- 1
src/pages/user/customization/customizationList.vue 查看文件

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

+ 1
- 1
src/pages/user/placeOrder/page.scss 查看文件

160
                           bottom: 0;
160
                           bottom: 0;
161
                           .swiper-slide{
161
                           .swiper-slide{
162
                             height: auto !important;
162
                             height: auto !important;
163
-                            padding: .15rem 0;
163
+                            padding: 0;
164
                             position: relative;
164
                             position: relative;
165
                             &::after{
165
                             &::after{
166
                               content: '';
166
                               content: '';

+ 9
- 5
src/pages/user/rush/index.vue 查看文件

23
           <source :src="data.VideoUrl" type="video/rm">
23
           <source :src="data.VideoUrl" type="video/rm">
24
         </video>
24
         </video>
25
         <img v-else src="" width="100%" height="100%">
25
         <img v-else src="" width="100%" height="100%">
26
-      </div> -->
26
+      </div>-->
27
       <pre class="rule" v-html="detail.FlashBuyInfo"></pre>
27
       <pre class="rule" v-html="detail.FlashBuyInfo"></pre>
28
       <!-- <div class="scope-of-time">
28
       <!-- <div class="scope-of-time">
29
         <div>活动时间</div>
29
         <div>活动时间</div>
30
         <div>{{toolClass.dateFormat(detail.StartDate)}} ~ {{toolClass.dateFormat(detail.EndDate)}}</div>
30
         <div>{{toolClass.dateFormat(detail.StartDate)}} ~ {{toolClass.dateFormat(detail.EndDate)}}</div>
31
-      </div> -->
31
+      </div>-->
32
     </div>
32
     </div>
33
-    <div class="sign-in" v-if="timeStatus !== 2 && detail.AttendantType === 'no' && !used" @click="signIn">立即注册</div>
33
+    <div
34
+      class="sign-in"
35
+      v-if="timeStatus !== 2 && detail.AttendantType === 'no' && !used"
36
+      @click="signIn"
37
+    >立即注册</div>
34
     <div class="submit">
38
     <div class="submit">
35
       <div :class="{light:timeStatus === 1}" @click="submit()" v-if="!used">{{btnText[timeStatus]}}</div>
39
       <div :class="{light:timeStatus === 1}" @click="submit()" v-if="!used">{{btnText[timeStatus]}}</div>
36
       <div v-else>已抢购</div>
40
       <div v-else>已抢购</div>
38
     <div class="success-box" v-if="showDialog">
42
     <div class="success-box" v-if="showDialog">
39
       <div class="success">
43
       <div class="success">
40
         <span>恭喜您!抢购成功</span>
44
         <span>恭喜您!抢购成功</span>
41
-        <img :src="logo" alt="">
45
+        <img :src="logo" alt>
42
         <span>长按二维码关注“城的空间”,进入会员中心查看吧</span>
46
         <span>长按二维码关注“城的空间”,进入会员中心查看吧</span>
43
         <div @click="showDialog = false">确定</div>
47
         <div @click="showDialog = false">确定</div>
44
       </div>
48
       </div>
93
           title: res.flashBuy.ActivityTitle || this.detail.FlashBuyName,
97
           title: res.flashBuy.ActivityTitle || this.detail.FlashBuyName,
94
           desc: res.flashBuy.ShareContent || '限时抢购中,名额有限,速来参与~',
98
           desc: res.flashBuy.ShareContent || '限时抢购中,名额有限,速来参与~',
95
           link: `${window.location.origin}${window.location.pathname}#/rush/?flashBuyId=${this.$route.query.flashBuyId}`,
99
           link: `${window.location.origin}${window.location.pathname}#/rush/?flashBuyId=${this.$route.query.flashBuyId}`,
96
-          thu_image: res.flashBuy.ShareImg || `https://spaceofcheng.oss-cn-beijing.aliyuncs.com/indexlogo.jpg?x-oss-process=style/wxicon`
100
+          thu_image: `${res.flashBuy.ShareImg}?x-oss-process=style/wxicon` || `https://spaceofcheng.oss-cn-beijing.aliyuncs.com/indexlogo.jpg?x-oss-process=style/wxicon`
97
         })
101
         })
98
       })
102
       })
99
     })
103
     })