Merge remote-tracking branch 'origin/branch' into branch

chenbiao
2 parents 2f02d40c 80a1be71
Showing 3 changed files with 238 additions and 2 deletions
pages.json
pages/businessCard/cardPrint.vue
pages/businessCard/printCard.vue
@@ -13,6 +13,14 @@
 	},
 	"pages": [
 		// pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+
+
+		{
+			"path": "pages/businessCard/cardPrint",
+			"style": {
+				"navigationBarTitleText": "卡券打印"
+			}
+		},
 		{
 			"path": "pages/index/index",
 			"style": {
+<template>
+    <view>
+        <uni-section title="50%(折扣券)" type="line">
+            <uni-card padding="0" spacing="0">
+                <uni-list>
+                    <uni-list-item title="适应车场"   rightText="万达商业广场"  >
+                        <text></text>
+                    </uni-list-item>
+                    <uni-list-item title="价格：¥5/张" rightText="商户库存：0张"></uni-list-item>
+                </uni-list>
+            </uni-card>
+        </uni-section>
+
+
+        <view style="padding: 15px">
+            二维码有效期：（自打印时间算起）
+            <uni-number-box @change="changeValue" />
+        </view>
+
+
+
+        <view class="uni-padding-wrap uni-common-mt">
+            <!--<button type="primary" style="margin-bottom: 15px">停止自动发放</button>-->
+            <button type="warn">立即打印</button>
+        </view>
+
+
+    </view>
+</template>
+
+<script>
+import common from "../../common/common.js";
+export default {
+  data() {
+    const currentDate = this.getDate({
+      format: true
+    })
+    return {
+      numberValue: 0,
+      title: 'picker',
+      array: ['全部', '充值', '支付'],
+      arrayWay: ['所有方式', '微信', '线下公对公'],
+      index: 0,
+      indexWay: 0,
+      benginDate: currentDate,
+      overDate: currentDate,
+      rows:[],
+      pageNum:1,//当前页
+      pageSize:1,//每页条数
+      reload:false,
+      status:'more',
+      contentText:{
+        contentdown:'上拉加载更多～',
+        contentrefresh:'正在加载更多～',
+        contentmore:'我是有底线的～'
+      },
+      iconType:'auto', // 图标样式
+    }
+  },
+  onLoad(params) {
+    wx.showShareMenu({
+      withShareTicket: true
+    })
+    // this.mycarNumber = params.carNumber;
+    // this.myorderId = params.orderId;
+    // this.myparkCode = params.parkCode;
+    // this.myorderState = params.orderState;
+    // this.totalFee = params.totalFee
+    // this.unPayFee = params.unPayFee
+    // if (params.orderState == 5) {
+    //   //停车补缴单 103
+    //   this.mypaySrcType = '103'
+    // } else {
+    //   this.mypaySrcType = '101'
+    // }
+    // // this.GetbillQueryInfo(this.mycarNumber, this.myorderId, this.myparkCode);
+    // this.getWxCode();
+    // this.PDlogin();
+    //console.log("xxxmake = "+this.makedateFormat());
+  },
+  onShow() {
+    var me = this;
+    var userInfo = me.getGlobalUser("globalUser");
+    if (userInfo != null) {
+      me.phoneNumb = userInfo.userPhone;
+    }
+    var pages = getCurrentPages();
+    var currPage = pages[pages.length - 1]; //当前页面
+    console.log('currPage.data.selCoupon = ' + currPage.data.selCoupon);
+    me.selCoupon = currPage.data.selCoupon;
+    console.log(JSON.stringify(me.selCoupon));
+    // me.GetbillQueryInfo(me.mycarNumber, me.myorderId, me.myparkCode, me.selCoupon.cardNo, me.selCoupon.couponType, me.selCoupon
+    //   .discValue);
+    // GetbillQueryInfo(carnum, orderId, parkCode, cardNo, couponType, disValue) {
+  },
+  computed: {
+    startDate() {
+      return this.getDate('start');
+    },
+    endDate() {
+      return this.getDate('end');
+    }
+  },
+  methods: {
+    change(value) {
+      this.numberValue = value
+    },
+    actionsClick(text){
+      uni.showToast({
+        title:text,
+        icon:'none'
+      })
+    },
+    bindPickerChange: function (e) {
+      console.log('picker发送选择改变，携带值为', e.detail.value)
+      this.index = e.detail.value
+    },
+    bindPickerChangeWay: function (e) {
+      console.log('picker发送选择改变，携带值为', e.detail.value)
+      this.indexWay = e.detail.value
+    },
+    bindStartDateChange: function (e) {
+      this.benginDate = e.detail.value
+    },
+    bindEndDateChange: function (e) {
+      this.overDate = e.detail.value
+    },
+    getDate(type) {
+      const date = new Date();
+      let year = date.getFullYear();
+      let month = date.getMonth() + 1;
+      let day = date.getDate();
+      if (type === 'start') {
+        year = year - 60;
+      } else if (type === 'end') {
+        year = year + 2;
+      }
+      month = month > 9 ? month : '0' + month;
+      day = day > 9 ? day : '0' + day;
+      return `${year}-${month}-${day}`;
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+    /deep/ .uni-section{
+        padding-bottom: 10px;
+    }
+    .rechargeWrap{
+        position: relative;
+        .rechargeArrow{
+            position: absolute;
+            right: 10px;
+            top: 30px;
+            font-size: 20px;
+            color: #999;
+        }
+    }
+    .recordCon {
+        padding-right: 35px;
+        color: #999;
+        display: flex;
+        justify-content: space-between;
+    }
+
+    .container {
+        overflow: hidden;
+    }
+
+    .custom-cover {
+        flex: 1;
+        flex-direction: row;
+        position: relative;
+    }
+
+    .cover-content {
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        height: 40px;
+        background-color: rgba($color: #000000, $alpha: 0.4);
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        padding-left: 15px;
+        font-size: 14px;
+        color: #fff;
+    }
+
+    .card-actions {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-around;
+        align-items: center;
+        height: 45px;
+        border-top: 1px #eee solid;
+    }
+    .card-actions-item {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+    }
+    .card-actions-item-text {
+        font-size: 12px;
+        color: #666;
+        margin-left: 5px;
+    }
+    .cover-image {
+        flex: 1;
+        height: 150px;
+    }
+    .no-border {
+        border-width: 0;
+    }
+
+</style>
@@ -17,10 +17,16 @@
             </view>
         </view>
+        <view style="padding: 15px">
+            二维码有效期：（自打印时间算起）
+            <uni-number-box @change="changeValue" />
+        </view>
+
+
         <view class="uni-padding-wrap uni-common-mt">
-            <button type="primary" style="margin-bottom: 15px">停止自动发放</button>
-            <button type="warn">打印静态二维码</button>
+            <!--<button type="primary" style="margin-bottom: 15px">停止自动发放</button>-->
+            <button type="warn">立即打印</button>
         </view>
@@ -35,6 +41,7 @@ export default {
       format: true
     })
     return {
+      numberValue: 0,
       title: 'picker',
       array: ['全部', '充值', '支付'],
       arrayWay: ['所有方式', '微信', '线下公对公'],
@@ -100,6 +107,9 @@ export default {
     }
   },
   methods: {
+    change(value) {
+      this.numberValue = value
+    },
     actionsClick(text){
       uni.showToast({
         title:text,