提交代码

src/assets/mall/PsMyCoupon.css

@@ -55,118 +55,3 @@
 .PsMyCoupon ._el_tab_2 ul li.active{
     color: #E73828;
 }
-.PsMyCoupon ._content_item{
-    display: flex;
-    flex-wrap: wrap;
-}
-.PsMyCoupon ._content_item ._item{
-    width: 220px;
-    position: relative;
-    transition: all linear .5s;
-    overflow: hidden;
-    margin: 5px 4px;
-}
-.PsMyCoupon ._content_item ._item:hover{
-    box-shadow: 0px 1px 13px 0px rgb(189, 189, 189);
-}
-.PsMyCoupon ._content_item ._top{
-    background-color: #F1BC69;
-}
-.PsMyCoupon ._content_item ._top ._time{
-    color: #A7711C;
-}
-.PsMyCoupon ._content_item ._top._blue{
-    background-color: #8794E2;
-}
-.PsMyCoupon ._content_item ._top._blue ._time{
-    color: #4C58A4;
-}
-.PsMyCoupon ._content_item div._top._gray{
-    background-color: #C3C3C3 !important;
-}
-.PsMyCoupon ._content_item div._top._gray ._overdue,.PsMyCoupon ._content_item div._top._gray ._info_bottom{
-    display: none
-}
-.PsMyCoupon ._content_item div._top._gray ._info_sale{
-    color: #FFFFFF !important;
-}
-.PsMyCoupon ._content_item div._top._gray ._time{
-    color: #777777 !important;
-}
-.PsMyCoupon ._top_raduis{
-    display: flex;
-    justify-content: space-between;
-}
-.PsMyCoupon ._top_raduis span{
-    display: inline-block;
-    width: 8px;
-    height: 8px;
-    margin: 3px;
-    border-radius: 50%;
-    background-color: white;
-    margin-top: -4px;
-}
-.PsMyCoupon ._item ._top ._overdue{
-    background-color: #E9F026;
-    color: #666666;
-    padding: 4px 6px;
-    position: absolute;
-    left: 0;
-    top: 0;
-    font-size: 12px;
-}
-.PsMyCoupon ._item ._top ._info_details{
-    padding: 15px 10px;
-}
-.PsMyCoupon ._item ._top ._info_details ._info_sale{
-    font-size: 30px;
-    color: white;
-}
-.PsMyCoupon ._item ._top ._info_details ._info_sale span{
-    font-size: 20px;
-    color: white;
-}
-.PsMyCoupon ._item ._top ._info_details ._info_full{
-    color: #FFFFFF;
-    font-size: 12px;
-    padding: 5px 0;
-}
-.PsMyCoupon ._item ._top ._info_details ._info_time{
-    font-size: 12px;
-}
-.PsMyCoupon ._item ._top ._info_details  ._info_bottom{
-    padding: 1px 5px;
-    color: #A7711C;
-    font-size: 12px;
-    position: absolute;
-    border: 1px solid #A7711C;
-    border-radius: 4px;
-    right: 13px;
-    top: 24px;
-    cursor: pointer;
-}
-.PsMyCoupon ._item ._bottom{
-    padding: 15px 10px;
-    background-color: #F9F9F9;
-}
-.PsMyCoupon ._item ._bottom p{
-    font-size: 12px;
-    color: #333333;
-    font-weight: bold;
-    margin-bottom: 13px;
-}
-.PsMyCoupon ._item ._bottom p._bottom_info{
-    color: #666666;
-    font-weight: 300;
-}
-.PsMyCoupon ._item ._bottom p._margin_bt0{
-    margin-bottom: 0 !important;
-}
-.PsMyCoupon p._info_coupon_name{
-    font-size: 18px !important;
-    max-width: 140px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    color: white;
-}
\ No newline at end of file

src/components/newPersonalCenter/block/MyCoupon.vue

@@ -44,11 +44,13 @@
     <!-- 列表 -->
     <el-row class="_table_box" v-loading="dataLoading">
       <div v-if="dataList.length>0" class="_content_item">
-        <div class="_item" v-for="(item, index) in dataList">
+        <template v-for="(item, index) in dataList">
+          <VCoupon :item='item'/>
+        </template>
+        <!-- <div class="_item" v-for="(item, index) in dataList">
           <div
             class="_top"
-            :class="{'_blue':item.couponsType===1,'_gray':item.couponEffectStatus===3,}"
-          >
+            :class="{'_blue':item.couponsType===1,'_gray':item.couponEffectStatus===3,}">
             <div class="_top_raduis">
               <span></span>
               <span></span>
@@ -92,7 +94,7 @@
             <p class="_bottom_tit">优惠券来源</p>
             <p class="_bottom_info _margin_bt0">{{item.accessType === 1 ? '抽奖活动' : '其他'}}</p>
           </div>
-        </div>
+        </div> -->
       </div>
       <div class="empty-data" v-else>
         <i class="iconfont icon-kong"></i>
@@ -112,8 +114,11 @@
   </el-row>
 </template>
 <script>
+import Coupon from './model/SmallComponents/Coupon'
 export default {
-  components: {},
+  components: {
+    VCoupon: Coupon,
+  },
   data() {
     return {
       dropdownText: "通用",

src/components/newPersonalCenter/block/model/OverCoupon.vue

@@ -12,11 +12,13 @@
       </div>
     </el-row>
     <el-row class="_my_coupon">
-      <div class="_item" v-for="(item, index) in couponList">
+      <template v-for="(item, index) in couponList">
+        <VCoupon v-if="index < 4" :item='item'/>
+      </template>
+      <!-- <div class="_item" v-for="(item, index) in couponList">
         <div
           class="_top"
-          :class="{'_blue':item.couponsType===1,'_gray':item.couponEffectStatus===3,}"
-        >
+          :class="{'_blue':item.couponsType===1,'_gray':item.couponEffectStatus===3,}" >
           <div class="_top_raduis">
             <span></span>
             <span></span>
@@ -58,7 +60,7 @@
           <p class="_bottom_tit">优惠券来源</p>
           <p class="_bottom_info _margin_bt0">{{item.accessType === 1 ? '抽奖活动' : '其他'}}</p>
         </div>
-      </div>
+      </div> -->
       <div class="empty-data" v-if="couponList.length<1">
         <i class="iconfont icon-kong"></i>
         很抱歉，你想要的信息我们真的找不到了
@@ -68,13 +70,16 @@
 </template>
 
 <script>
+import Coupon from './SmallComponents/Coupon'
 export default {
-  components: {},
+  components: {
+    VCoupon: Coupon,
+  },
   data() {
     return {
       getCouponMsg: {
         pageIndex: 1,
-        pageSize: 4,
+        pageSize: 1000,
         useState: 1,
         lineId: 0,
         lineteamId: 0,
@@ -102,17 +107,20 @@ export default {
         this.getCouponMsg,
         res => {
           let nowTime = this.getNowDate();
+          let couponList = [];
           if (res.data.resultCode == 1) {
             let data = res.data.data.pageData;
             data.forEach((x, i) => {
               let cha = this.DateDiff(nowTime, x.expirationDate);
+              console.log(cha)
               if (cha < 10) {
                 x.warning = true;
+                couponList.push(x)
               } else {
                 x.warning = false;
               }
             });
-            this.couponList = data;
+            this.couponList = couponList;
             this.$forceUpdate();
           } else {
             this.Error(res.data.message);

src/components/newPersonalCenter/integral/model/exchange.vue

@@ -2,8 +2,23 @@
 
 </style>
 <template>
-  <div>
-    我的兑换
+  <div class="exchange">
+    <!-- 查询条件 -->
+    <el-row class="integralDetail_row">
+      <div class="__cp _drop">
+        <el-dropdown trigger="click" @command="handleCommandOne">
+          <span class="el-dropdown-link">
+            {{Name}}
+            <i class="el-icon-arrow-down el-icon--right"></i>
+          </span>
+          <el-dropdown-menu slot="dropdown">
+            <template v-for="item in TypeList">
+              <el-dropdown-item :command="item">{{item.Name}}</el-dropdown-item>
+            </template>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </div>
+    </el-row>
   </div>
 </template>
 <script>
@@ -14,8 +29,30 @@ export default {
   props:{},
   data(){
     return{
-      
+      Name: '全部',
+      TypeList: [
+        {
+          ID: -1,
+          Name: '全部'
+        },
+        {
+          ID: 1,
+          Name: '收入'
+        },
+        {
+          ID: 2,
+          Name: '支出'
+        },
+      ],
     }
+  },
+  mounted(){
+
+  },methods:{
+    handleCommandOne(command) {
+      this.Type = command.ID;
+      this.Name = command.Name;
+    },
   }
 }
 </script>

src/components/newPersonalCenter/newPersonalCenter.vue

@@ -50,6 +50,10 @@
                 <i class="iconfont icon-huiyuanicon"></i>
                 <span slot="title">会员中心</span>
               </el-menu-item>
+              <el-menu-item index="9" @click="clickMenu('9')">
+                <i class="iconfont icon-huiyuanicon"></i>
+                <span slot="title">定制游</span>
+              </el-menu-item>
               <el-submenu index="8">
                 <template slot="title">
                   <i class="iconfont icon-dingdanicon"></i>

src/plugins/index.js

@@ -215,8 +215,8 @@ export default {
                 this.apiurl = apiurl;
                 var token = "";
                 var key = "";
-                let userInfo = localStorage.userInfo ? JSON.parse(localStorage.userInfo) : ''
-                let uid = userInfo.accountId ? userInfo.accountId : 0
+                // let userInfo = localStorage.userInfo ? JSON.parse(localStorage.userInfo) : ''
+                // let uid = userInfo.accountId ? userInfo.accountId : 0
                 if (this.getLocalStorage() != null) {
                     token = this.getLocalStorage().token;
                     key = this.getLocalStorage().SecretKey;
@@ -227,8 +227,7 @@ export default {
                     "msg": msg,
                     "timestamp": timestamp,
                     "token": token,
-                    "sign": md5Str,
-                    "uid": uid
+                    "sign": md5Str
                 }
                 if (localStorage.g && localStorage.g != 'undefined') {
                     postData.groupId = parseInt(JSON.parse(localStorage.g).i)