Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/wechat into dev

src/common/css/reset.css

@@ -77,4 +77,8 @@ select option {
 
 ::-webkit-scrollbar {
 	display: none;
+}
+
+.van-dialog__message .van-dialog__message--has-title{
+	text-align: center;
 }

src/components/caseTableItem/page.scss

@@ -17,13 +17,14 @@
   &>img{
     display: inline-block;
     position: absolute;
-    right: .1rem;
-    top: .05rem;
+    right: .15rem;
+    top: .15rem;
     // font-size: .36rem;
     width: .4rem;
-    height: .4rem;
     z-index: 1;
     color: rgba(255, 0, 0, .1);
+    transform: translateY(-50%);
+    -webkit-transform: translateY(-50%)
   }
   .itemNo{
     width: .44rem;

src/components/courseItem/index.vue

@@ -19,8 +19,8 @@
               <span>优惠券体验</span>
             </div>
           </div>
+          <span>时间：{{data.remark}}</span>
           <span>地点：{{data.address}}</span>
-          <span>备注：{{data.remark}}</span>
         </div>
       </div>
       <ul v-if="data.getWay=='ticket'">

src/components/myCard/myCard.vue

@@ -74,6 +74,7 @@ export default {
   margin-bottom: 0.2rem;
   &.invalid {
     filter: grayscale(100%);
+    opacity: .5;
   }
   .card-top {
     height: 0.88rem;

src/pages/sales/salesGiveOutDetail/page.scss

@@ -89,6 +89,7 @@
                   white-space: nowrap;
                   text-overflow: ellipsis;
                   overflow: hidden;
+                  flex:1;
                 }
                 >div{
                   span{

src/pages/user/majorProjectsDetail/index.vue

@@ -64,7 +64,7 @@
           <span>优惠券体验</span>
         </div>
       </div>
-      <a @click="toBuy">去购买</a>
+      <a @click="toBuy" :class="{gray:gray}">去购买</a>
     </div>
   </div>
 </template>
@@ -83,6 +83,7 @@ export default {
   data () {
     return {
       logo,
+      gray: false,
       swiperOption: {
         observer: true,
         autoplay: {
@@ -120,6 +121,11 @@ export default {
         arr = []
       }
       this.courseTimeList = arr.sort(function (a, b) { return new Date(a.BeginDate).getTime() > new Date(b.BeginDate).getTime() ? 1 : -1 })
+      let nowDate = Date.now()
+      let endData = new Date(this.courseDetail.EndDate).getTime()
+      if (nowDate > endData) {
+        this.gray = true
+      }
       // console.log(JSON.stringify(res))
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
         title: '城的空间',

src/pages/user/majorProjectsDetail/page.scss

@@ -242,6 +242,10 @@
       font-size: .15rem;
       margin-right: .2rem;
       background: #fc6243;
+      &.gray{
+        background: #666;
+      }
     }
   }
+  
 }

src/pages/user/placeOrder/index.vue

@@ -293,7 +293,8 @@ export default {
         coupon: JSON.stringify(this.postData.coupon)
       }).then((res) => {
         this.$dialog.alert({
-          message: '下单成功！'
+          message: '下单成功！',
+          confirmButtonText: '返回等待'
         }).then(() => {
           this.$router.push({ name: 'orderList' })
         })