ytj

public/index.html

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

src/components/orderItem/page.scss

@@ -1,4 +1,5 @@
 .orderItem{
+  padding: .15rem 0;
   .img{
     width: .72rem;
     position: relative;

src/pages/user/calendar/calendar.vue

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

src/pages/user/calendar/making.vue

@@ -57,7 +57,7 @@
         <div class="swiper-pagination"></div>
       </div>
       <div class="meassage" v-if="mainIndex !== 1">备注：为了美观效果请上传{{size}}尺寸照片，未按尺寸会默认裁剪</div>
-      <div class="meassage" v-else>&nbsp;</div>
+      <div class="meassage" v-else>左右滑动可上传自定义图片</div>
       <div class="operation">
         <div>
           <van-uploader :after-read="onRead" v-show="mainIndex !== 1">
@@ -217,6 +217,12 @@ export default {
     onRead (file) {
       let that = this
       this.isLoading = true
+      let reg = /^[0-9a-zA-Z.]+$/
+      if (!reg.test(file.file.name)) {
+        this.$toast('图片名称中包含非法字符')
+        this.isLoading = false
+        return
+      }
       let reader = new FileReader();
       reader.readAsDataURL(file.file);
       reader.onload = function (e) {
@@ -280,7 +286,7 @@ export default {
         if (!curr.CustomerImg) {
           curr.CustomerImg = curr.defaultNoUser
         } else {
-          curr.CustomerImg.replace('?x-oss-process=style/calendar-thumb', '')
+          curr.CustomerImg = curr.CustomerImg.replace('?x-oss-process=style/calendar-thumb', '')
         }
         delete curr['defaultNoUser']
         delete curr['CustomerImgShow']
@@ -292,7 +298,7 @@ export default {
         Imgs: data
       }
       this.calendar({ Calendar: JSON.stringify(submitData) }).then(() => {
-        this.$toast('日历已生成')
+        this.$toast('活动参与成功')
         this.$router.replace({ name: 'userCenter' })
       })
     },

src/pages/user/customization/customizationDetail.vue

@@ -6,7 +6,7 @@
         <div class="list">
           <img :src="detail.ModelName === '黑色'?cover:cover2">
           <div>
-            <div>云台天境 定制您的2019专属台历</div>
+            <div>定制您的2019专属台历</div>
             <div>主办案场: {{detail.CaseName}}</div>
             <div>参与时间: {{toolClass.dateFormat(detail.CreateDate)}}</div>
           </div>
@@ -27,6 +27,7 @@
           :src="item.CalendarImg"
           :key="index"
           v-if="showMore || index < 4"
+          @click="large(item.CalendarImg)"
         >
       </div>
       <div v-if="!showMore" @click="more()" class="more">
@@ -39,7 +40,7 @@
       </div>
     </div>
     <div class="foot">
-      <div>联系我们: 025-86426666</div>
+      <div @click="tel()">联系我们: 025-86426666</div>
     </div>
   </div>
 </template>
@@ -79,6 +80,19 @@ export default {
     },
     noMore () {
       this.showMore = false
+    },
+    large (src) {
+      let list = []
+      this.detail.Imgs.forEach(item => {
+        list.push(item.CalendarImg)
+      });
+      WeixinJSBridge.invoke('imagePreview', {
+        'current': src,
+        'urls': list
+      })
+    },
+    tel () {
+      window.location.href = 'tel:02586426666'
     }
   }
 }
@@ -195,5 +209,8 @@ export default {
   text-align: center;
   line-height: 0.9rem;
   background: #f2f2f2;
+  div {
+    color: #77a5f0;
+  }
 }
 </style>

src/pages/user/customization/customizationList.vue

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

src/pages/user/placeOrder/page.scss

@@ -160,7 +160,7 @@
                           bottom: 0;
                           .swiper-slide{
                             height: auto !important;
-                            padding: .15rem 0;
+                            padding: 0;
                             position: relative;
                             &::after{
                               content: '';

src/pages/user/rush/index.vue

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