ytj

src/components/discounts/discounts.vue

@@ -18,8 +18,8 @@
       </div>
     </div>
     <div class="useType">
-      <img :src="used" alt="已使用" v-if="data.useType == '已使用'" width="100%" height="100%">
-      <img :src="failure" alt="已失效" v-if="data.useType == '已失效'" width="100%" height="100%">
+      <img :src="used" v-if="data.useType == '已使用'" width="100%" height="100%">
+      <img :src="failure" v-if="data.useType == '已失效'" width="100%" height="100%">
     </div>
   </div>
 </template>

src/pages/sales/customerSearch/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mainPage flex-v">
     <div class="top">
-      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.Name : ''"></topCaseInfo>
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.RealName : ''"></topCaseInfo>
     </div>
     <div class="content flex-item">
       <div>

src/pages/sales/getRecord/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mainPage flex-v">
     <div class="top">
-      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.Name : ''" @selectCase="showSelect = true"></topCaseInfo>
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.RealName : ''" @selectCase="showSelect = true"></topCaseInfo>
     </div>
     <div class="info">
       <span><em>姓名：</em>{{user.name}}</span>

src/pages/sales/salesGiveOutDetail/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mainPage flex-v">
     <div class="top">
-      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.Name : ''" @selectCase="showVanPicker"></topCaseInfo>
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.RealName : ''" @selectCase="showVanPicker"></topCaseInfo>
     </div>
     <div class="flex-item flex-v body" v-if="data.allCard">
       <span>销售姓名：<em>{{data.RealName}}</em></span>

src/pages/sales/salesRecord/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mainPage flex-v">
     <div class="top">
-      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.Name : ''" @selectCase="showVanPicker"></topCaseInfo>
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.RealName : ''" @selectCase="showVanPicker"></topCaseInfo>
     </div>
     <div class="flex-item body">
       <div>

src/pages/user/App.vue

@@ -34,12 +34,12 @@ export default {
     this.getUserInfo({ org: this.org, code: this.code }).then(() => {
       this.showPage = true
     })
-    wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
-      title: '城的空间',
-      desc: '城的空间',
-      link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
-      thu_image: `${window.location.origin}${window.location.pathname}${logo}`
-    })
+    // wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
+    //   title: '城的空间',
+    //   desc: '城的空间',
+    //   link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
+    //   thu_image: `${window.location.origin}${window.location.pathname}${logo}`
+    // })
   },
   methods: {
     ...actions(['getUserInfo'])

src/pages/user/cardDetail/index.vue

@@ -14,7 +14,7 @@
       </div>
       <div class="rule">
         <div>使用规则</div>
-        <div>{{info.Share.CardUseInstruction}}</div>
+        <pre style="white-space: pre;">{{info.Share.CardUseInstruction}}</pre>
       </div>
       <div class="line">
         <img :src="Artboard" alt="" width="100%">

src/pages/user/couponsDetail/index.vue

@@ -13,10 +13,11 @@
       </div>
       <div class="rule">
         <div>使用规则</div>
-        <div>1. 此卡不可兑换现金，不可与其他优惠活动同时使用。 </div>
+        <pre style="white-space: pre;">{{info.Share.UseInstruction}}</pre>
+        <!-- <div>1. 此卡不可兑换现金，不可与其他优惠活动同时使用。 </div>
         <div>2. 此卡不可多人使用，一人记一次。 </div>
         <div>3. 非会员可凭此卡享受对应课程。 </div>
-        <div>4. 截止日期至{{toolClass.dateFormat(info.EndDate)}}。 </div>
+        <div>4. 截止日期至{{toolClass.dateFormat(info.EndDate)}}。 </div> -->
       </div>
       <div class="line">
         <img :src="Artboard" alt="" width="100%">

src/pages/user/mainPage/coffeeIndex/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mainPage flex-v">
     <div class="top">
-      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.Name : ''" @selectCase="showVanPicker"></topCaseInfo>
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.RealName : ''" @selectCase="showVanPicker"></topCaseInfo>
     </div>
     <nav class="flex-h" v-if="userInfo.customer.MapUser !== ''">
       <a class="flex-item" v-for="(item,index) in cutNavList" :key="index" v-if="userInfo.customer.UserTypeId !== 'manager' || item.id !== '4'" :class="{'active': navActive === index}" @click="cutNav(index)">{{item.value}}</a>

src/pages/user/mainPage/indexPage/index.vue

@@ -152,7 +152,7 @@ export default {
       if (item.ForwardType === 'url') {
         window.location.href = item.ForwardUrl
       } else if (item.ForwardType === 'course') {
-        this.$router.push({ name: '', query: { id: item.ForwardResourceId } }) // 此处去课程详情
+        this.$router.push({ name: 'majorProjectsDetail', query: { id: item.ForwardResourceId } }) // 此处去课程详情
       } else {
         window.location.href = item.InfoUrl
       }

src/pages/user/placeOrder/index.vue

@@ -70,6 +70,13 @@
     </div>
     <orderPopup :show="showPopup" :data="currentSpec" @closePopup="closePopup" @returnData="calcMenus"></orderPopup>
     <calcMenu :show="showCalcMenu" :totalNum="sumNum + caseTotal.total" :data="selGoods" @returnData="calcMenus" @emptyMenus="emptyMenus" @closeCalcMenu="closeCalcMenu" @placeOrder="placeOrder"></calcMenu>
+    <div class="successPopup" v-if="showSuccessPopup">
+      <div>
+        <i class="iconfont icon-gou"></i>
+        <div class="text">出单成功</div>
+        <div class="back" @click="popBack">返回等待</div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -136,6 +143,7 @@ export default {
         freeModeMomentumVelocityRatio: 2,
       },
       selGoods: [],
+      showSuccessPopup: false
     }
   },
   computed: {
@@ -295,14 +303,19 @@ export default {
         detail: JSON.stringify(this.postData.detail),
         coupon: JSON.stringify(this.postData.coupon)
       }).then((res) => {
-        this.$dialog.alert({
-          message: '下单成功！',
-          confirmButtonText: '返回等待'
-        }).then(() => {
-          this.$router.push({ name: 'orderList' })
-        })
+        this.showSuccessPopup = true
+        // this.$dialog.alert({
+        //   message: '下单成功！',
+        //   confirmButtonText: '返回等待'
+        // }).then(() => {
+
+        // })
       })
     },
+    popBack () {
+      this.showSuccessPopup = false
+      this.$router.push({ name: 'orderList' })
+    },
     closeCalcMenu () { // 关闭已选菜单
       this.showCalcMenu = false
     },

src/pages/user/placeOrder/page.scss

@@ -238,4 +238,43 @@
       }
     }
   }
+  .successPopup{
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 999;
+    background: rgba(0, 0, 0, .05);
+    >div{
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%,-50%);
+      width: 2.6rem;
+      height: 1.7rem;
+      background:rgba(255,255,255,1);
+      box-shadow:0px 2px 4px 0px rgba(194,194,194,0.5);
+      border-radius:4px;
+      display: flex;
+      flex-flow: column nowrap;
+      justify-content: center;
+      align-items: center;
+      padding: .2rem;
+      i{
+        color: #fc6243;
+        font-size: .36rem;
+        margin-bottom: .2rem;
+      }
+      .text{
+        font-size: .16rem;
+        margin-bottom: .2rem;
+      }
+      .back{
+        padding: .07rem .3rem;
+        border: 1px solid black;
+        border-radius: 4px;
+      }
+    }
+  }
 }

src/pages/user/placeOrderDetail/index.vue

@@ -65,6 +65,13 @@
         <a @click="sureSelectCoupon">确定</a>
       </div>
     </div>
+    <div class="successPopup" v-if="showSuccessPopup">
+      <div>
+        <i class="iconfont icon-gou"></i>
+        <div class="text">出单成功</div>
+        <div class="back" @click="popBack>返回等待</div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -105,7 +112,8 @@ export default {
         value: '优惠券3',
         id: '3',
       }],
-      orderInfo: JSON.parse(_self.$route.query.info) || []
+      orderInfo: JSON.parse(_self.$route.query.info) || [],
+      showSuccessPopup: false
     }
   },
   components: {
@@ -225,13 +233,18 @@ export default {
         detail: JSON.stringify(this.postData.detail),
         customercouponid: this.postData.customercouponid
       }).then((res) => {
-        this.$dialog.alert({
-          message: '下单成功！'
-        }).then(() => {
-          window.history.go(-2)
-        })
+        this.showSuccessPopup = true
+        // this.$dialog.alert({
+        //   message: '下单成功！'
+        // }).then(() => {
+        //   window.history.go(-2)
+        // })
       })
     },
+    popBack () {
+      this.showSuccessPopup = false
+      window.history.go(-2)
+    },
     cancel () {
       window.history.go(-1)
     },

src/pages/user/placeOrderDetail/page.scss

@@ -299,4 +299,43 @@
     //   }
     // }
   }
+  .successPopup{
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 999;
+    background: rgba(0, 0, 0, .05);
+    >div{
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%,-50%);
+      width: 2.6rem;
+      height: 1.7rem;
+      background:rgba(255,255,255,1);
+      box-shadow:0px 2px 4px 0px rgba(194,194,194,0.5);
+      border-radius:4px;
+      display: flex;
+      flex-flow: column nowrap;
+      justify-content: center;
+      align-items: center;
+      padding: .2rem;
+      i{
+        color: #fc6243;
+        font-size: .36rem;
+        margin-bottom: .2rem;
+      }
+      .text{
+        font-size: .16rem;
+        margin-bottom: .2rem;
+      }
+      .back{
+        padding: .07rem .3rem;
+        border: 1px solid black;
+        border-radius: 4px;
+      }
+    }
+  }
 }