telephone-clients 3.0.103 → 3.0.104-2

package/src/components/pos/charge/sellgas/ChoosePayWay.vue

@@ -1,275 +1,275 @@
-<template>
-  <div>
-    <!--<div class="container-fluid toppanel auto">-->
-      <!--<div class="container">-->
-        <!--<div class="row margin15">-->
-          <!--<div class="col-md-6"><img :src="logo()" class="img-responsive" alt=""/></div>-->
-          <!--<div class="col-md-6 text-right titlebtn">-->
-            <!--<a href="javascript:void(0)" class="back" @click="back('tosell')">返回</a>-->
-            <!--<a href="javascript:void(0)" @click="back('tomain')" class="tomain">退出</a>-->
-          <!--</div>-->
-        <!--</div>-->
-      <!--</div>-->
-    <!--</div>-->
-    <div class="mhead" v-if="!hideHead">
-      <ul>
-        <li>
-          <text>购气写卡</text>
-        </li>
-      </ul>
-    </div>
-    <div class="body">
-    <div class="container contentpanel auto">
-      <div class="row buypanel">
-        <div class="buyform">
-          <h3 style="color: red;">订单信息</h3>
-          <div>
-            <h4>用户编号：{{userInfo.f_userinfo_code}}</h4>
-          </div>
-          <div>
-            <h4>用户名称：{{userInfo.f_user_name}}</h4>
-          </div>
-          <div>
-            <h4>购 气 量：{{stairPrice.f_pregas}} &nbsp;&nbsp;方</h4>
-          </div>
-          <div>
-            <h4>支付金额：{{stairPrice.f_collection}} &nbsp;&nbsp;元</h4>
-          </div>
-        </div>
-        <div class="horizontal" height="auto">
-          <h3 style="color: red;">请选择支付方式</h3>
-          <table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
-            <tbody>
-            <tr>
-              <td align="center" v-if='payBtn1.show' class="col-xs-4  weixin">
-                <div @click='pay("1")'>
-                  <img :src="btn1Path" alt=""/>
-                </div>
-              </td>
-
-              <td align="center" v-if='payBtn2.show' class="col-xs-4  alipay">
-                <div @click='pay("2")'>
-                  <img :src="btn2Path " alt=""/>
-                </div>
-              </td>
-
-              <td align="center" v-if='payBtn3.show' class="col-xs-4  unionpay">
-                <div @click='pay("3")'>
-                  <img :src="btn3Path" alt=""/>
-                </div>
-              </td>
-
-            </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
-    </div>
-    <div class="foot"  @click="back('tomain')">
-      <text>返回</text>
-    </div>
-  </div>
-</template>
-<script>
-  import co from 'co'
-  import Vue from 'vue'
-  let testUnionPaySave = function* (self, data) {
-    return self.$post(Vue.ProxyUrl + '/rs/logic/saveCharge', {data: data}, {resolveMsg: null, rejectMsg: null})
-  }
-  let generateScanGen = function *  generateScan(self,attach) {
-    let money = Vue.PosUtil.yuan2fen(self.stairPrice.f_collection)
-    //测试环境支付金额统一改为1分
-    if( self.$PosUtil.posParam.isTest){
-      money= 1
-    }
-    let str = self.$PosUtil.posParam.orderScrib
-    //tag
-    //tag
-    //post去后台给微信下单并生成二维码和流水号
-    self.$resetpost(Vue.ProxyUrl + '/rs/logic/'+self.$PosUtil.posParam.module+'GetCode', {config:self.$PosUtil.posParam.config, f_revenue:self.$PosUtil.posParam.revenue,
-      pay_way: self.stairPrice.pay_way, money: money + '', attach: attach, body: str ,filiale_wx: self.$PosUtil.posParam.filiale_wx}, {resolveMsg: null, rejectMsg: null}).then((ret) => {
-      //tag
-    //tag
-    if (ret.data.code === 200) {
-      //tag
-      self.stairPrice.url = ret.data.url
-      self.stairPrice.f_serial_id = ret.data.f_out_trade_no //微信订单流水号
-      //tag
-      // //tag)
-      //tag
-      self.$goto('scan-qrcode', {userInfo: self.userInfo, cardInfo: self.cardInfo, stair: self.stairPrice}, 'self', self.back)
-      // //tag
-      // 设置下一个服务状态为扫码支付 需要去轮询数据库
-      // self.next.isQR = true
-      // this.resolve(true)
-    } else {
-      self.$back('getbillerro')
-      // this.resolve(false)
-    }
-  }
-  ).catch((ret) => {
-      // this.resolve(false)
-    //tag
-    self.$back('getbillerro')
-  })
-  }
-
-  export default {
-    title: '选择支付方式',
-    data() {
-      return {
-        hadclick: false,
-        hideHead:false,
-        // userInfo: {},
-        // stairPrice: {},
-        // cardInfo: {},
-        btn1Path:'',
-        btn2Path:'',
-        btn3Path:'',
-        payBtn1:{
-          show: false,
-          path: "",
-          method:"",
-          pay_way:"",
-          payment:""
-        },
-        payBtn2: {
-          show: false,
-          path: "",
-          method:"",
-          pay_way:"",
-          payment:""
-        },
-        payBtn3: {
-          show: false,
-          path: "",
-          method:"",
-          pay_way:"",
-          payment:""
-        },
-        isMachine: false, //本次流程是否是机表
-        resolve: undefined,
-        reject: undefined,
-        obj: undefined
-      }
-    },
-    props: ['userInfo', 'cardInfo','stairPrice'],
-    methods: {
-      logo() {
-        return Vue.ProxyUrl + '/res/'+this.$PosUtil.posParam.imgpath+'/sublogo.png'
-      },
-      back(para) {
-        // 返回或者退出，回滚该次事务
-        // this.resolve(false)
-        this.$back(para)
-      },
-      // getQR() {
-      //   this.obj.getQR()
-      // },
-      getAttach(){
-        let attach = {}
-        //tag
-        attach.f_user_id = this.userInfo.f_user_id              //用户ID
-        // attach.f_card_id = self.cardInfo.CardID
-        attach.f_pregas = this.stairPrice.f_pregas          //购气量
-        // attach.f_times = self.cardInfo.Times + 1
-        attach.f_preamount = this.stairPrice.f_preamount
-        attach.f_payment= this.stairPrice.f_payment
-        attach.f_terminal_num = this.$PosUtil.Sn    //设备值 f_operator
-        attach.f_collection = this.stairPrice.f_collection
-        attach.isGasValue = this.userInfo.f_collection_type === '按金额' ? 1 : 0
-        attach.f_totalcost = this.stairPrice.f_totalcost - 0
-        attach.isHand = this.userInfo.f_meter_type ==='机表'? 1 :this.userInfo.f_meter_type ==='物联网表'? -1 :0
-        attach.f_delaypay = this.stairPrice.f_delaypay
-        attach.hand_ids = this.stairPrice.hand_ids
-        if(this.cardInfo.Meterid !== undefined  && this.cardInfo.Meterid !== ''){
-          attach.f_meterid = this.cardInfo.Meterid
-        }
-        if (this.userInfo.f_meter_type !=='机表'&& this.userInfo.f_meter_type !=='物联网表' ){
-          attach.f_card_id = this.cardInfo.CardID
-          attach.f_times =this.cardInfo.Times + 1
-        }
-        // 生产环境金额单位由元  转为分
-        //tag==",attach)
-        return attach
-      },
-      getQR() {
-        //tag
-        if (!this.hadclick) {
-          this.hadclick = true
-          let  attach = this.getAttach()
-          //tag中attach==",attach)
-          let gen = generateScanGen(this,attach)
-          return co(gen)
-        }
-      },
-      payMethod(paymethod) {
-        //tag
-        if(paymethod === 'qrcode'){
-          //tag
-          this.getQR()
-        } else if(paymethod === 'card'){
-          //tag
-          this.cardPay()
-        }else{
-          this.$showMessage(`未知支付方式:${paymethod}，请联系管理员`)
-        }
-      },
-      cardPay() {
-        let data = this.getAttach()
-        try {
-          HostApp.__this__ = this
-          HostApp.pay({
-            data: data,
-            callback: 'javascript:HostApp.__this__.toWriteCard();'
-          })
-        } catch (e) {
-          data.f_serial_id = this.$PosUtil.getBillNum()
-          var gen = testUnionPaySave(this, data)
-          co(gen)
-          this.toWriteCard()
-        }
-
-      },
-      toWriteCard() {
-        this.stairPrice.steps = 1
-        let id = this.$AndroidPlugin.getSellId()
-        this.stairPrice.id = Number(id)
-        this.$goto('order-info', {userInfo: this.userInfo, cardInfo: this.cardInfo, stairPrice: this.stairPrice, status:2,obj: this.obj.next}, 'self', this.back)
-      },
-      pay(str) {
-        //tag
-        if(str==='1'){
-          this.stairPrice.pay_way = this.payBtn1.pay_way
-          this.stairPrice.f_payment = this.payBtn1.payment
-          this.payMethod(this.payBtn1.method)
-        }else if (str === '2') {
-          this.stairPrice.pay_way = this.payBtn2.pay_way
-          this.stairPrice.f_payment = this.payBtn2.payment
-          this.payMethod(this.payBtn2.method)
-        } else {
-          this.stairPrice.pay_way = this.payBtn2.pay_way
-          this.stairPrice.f_payment = this.payBtn2.payment
-          this.payMethod(this.payBtn3.method)
-        }
-      }
-    },
-    ready() {
-      this.cardInfo = this.cardInfo
-      // 服务对象的引用
-      this.obj = this.obj
-      this.userInfo = this.userInfo
-      this.stairPrice = this.stairPrice
-      this.payBtn1 = this.$PosUtil.posParam.PayBtn1   //支付按钮1
-      this.payBtn2 = this.$PosUtil.posParam.PayBtn2   //支付按钮2
-      this.payBtn3 = this.$PosUtil.posParam.PayBtn3 //支付按钮3
-      this.btn1Path =require(`../../image/${this.payBtn1.path}`)
-      this.btn2Path =require(`../../image/${this.payBtn2.path}`)
-      this.btn3Path =require(`../../image/${this.payBtn3.path}`)
-      // 设置服务对象里的组件对象
-      // this.obj.setComponents(this)
-    }
-  }
-
-</script>
+<template>
+  <div>
+    <!--<div class="container-fluid toppanel auto">-->
+      <!--<div class="container">-->
+        <!--<div class="row margin15">-->
+          <!--<div class="col-md-6"><img :src="logo()" class="img-responsive" alt=""/></div>-->
+          <!--<div class="col-md-6 text-right titlebtn">-->
+            <!--<a href="javascript:void(0)" class="back" @click="back('tosell')">返回</a>-->
+            <!--<a href="javascript:void(0)" @click="back('tomain')" class="tomain">退出</a>-->
+          <!--</div>-->
+        <!--</div>-->
+      <!--</div>-->
+    <!--</div>-->
+    <div class="mhead" v-if="!hideHead">
+      <ul>
+        <li>
+          <text>购气写卡</text>
+        </li>
+      </ul>
+    </div>
+    <div class="body">
+    <div class="container contentpanel auto">
+      <div class="row buypanel">
+        <div class="buyform">
+          <h3 style="color: red;">订单信息</h3>
+          <div>
+            <h4>用户编号：{{userInfo.f_userinfo_code}}</h4>
+          </div>
+          <div>
+            <h4>用户名称：{{userInfo.f_user_name}}</h4>
+          </div>
+          <div>
+            <h4>购 气 量：{{stairPrice.f_pregas}} &nbsp;&nbsp;方</h4>
+          </div>
+          <div>
+            <h4>支付金额：{{stairPrice.f_collection}} &nbsp;&nbsp;元</h4>
+          </div>
+        </div>
+        <div class="horizontal" height="auto">
+          <h3 style="color: red;">请选择支付方式</h3>
+          <table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
+            <tbody>
+            <tr>
+              <td align="center" v-if='payBtn1.show' class="col-xs-4  weixin">
+                <div @click='pay("1")'>
+                  <img :src="btn1Path" alt=""/>
+                </div>
+              </td>
+
+              <td align="center" v-if='payBtn2.show' class="col-xs-4  alipay">
+                <div @click='pay("2")'>
+                  <img :src="btn2Path " alt=""/>
+                </div>
+              </td>
+
+              <td align="center" v-if='payBtn3.show' class="col-xs-4  unionpay">
+                <div @click='pay("3")'>
+                  <img :src="btn3Path" alt=""/>
+                </div>
+              </td>
+
+            </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+    </div>
+    <div class="foot"  @click="back('tomain')">
+      <text>返回</text>
+    </div>
+  </div>
+</template>
+<script>
+  import co from 'co'
+  import Vue from 'vue'
+  let testUnionPaySave = function* (self, data) {
+    return self.$post(Vue.ProxyUrl + '/rs/logic/saveCharge', {data: data}, {resolveMsg: null, rejectMsg: null})
+  }
+  let generateScanGen = function *  generateScan(self,attach) {
+    let money = Vue.PosUtil.yuan2fen(self.stairPrice.f_collection)
+    //测试环境支付金额统一改为1分
+    if( self.$PosUtil.posParam.isTest){
+      money= 1
+    }
+    let str = self.$PosUtil.posParam.orderScrib
+    //tag
+    //tag
+    //post去后台给微信下单并生成二维码和流水号
+    self.$resetpost(Vue.ProxyUrl + '/rs/logic/'+self.$PosUtil.posParam.module+'GetCode', {config:self.$PosUtil.posParam.config, f_revenue:self.$PosUtil.posParam.revenue,
+      pay_way: self.stairPrice.pay_way, money: money + '', attach: attach, body: str ,filiale_wx: self.$PosUtil.posParam.filiale_wx}, {resolveMsg: null, rejectMsg: null}).then((ret) => {
+      //tag
+    //tag
+    if (ret.data.code === 200) {
+      //tag
+      self.stairPrice.url = ret.data.url
+      self.stairPrice.f_serial_id = ret.data.f_out_trade_no //微信订单流水号
+      //tag
+      // //tag)
+      //tag
+      self.$goto('scan-qrcode', {userInfo: self.userInfo, cardInfo: self.cardInfo, stair: self.stairPrice}, 'self', self.back)
+      // //tag
+      // 设置下一个服务状态为扫码支付 需要去轮询数据库
+      // self.next.isQR = true
+      // this.resolve(true)
+    } else {
+      self.$back('getbillerro')
+      // this.resolve(false)
+    }
+  }
+  ).catch((ret) => {
+      // this.resolve(false)
+    //tag
+    self.$back('getbillerro')
+  })
+  }
+
+  export default {
+    title: '选择支付方式',
+    data() {
+      return {
+        hadclick: false,
+        hideHead:false,
+        // userInfo: {},
+        // stairPrice: {},
+        // cardInfo: {},
+        btn1Path:'',
+        btn2Path:'',
+        btn3Path:'',
+        payBtn1:{
+          show: false,
+          path: "",
+          method:"",
+          pay_way:"",
+          payment:""
+        },
+        payBtn2: {
+          show: false,
+          path: "",
+          method:"",
+          pay_way:"",
+          payment:""
+        },
+        payBtn3: {
+          show: false,
+          path: "",
+          method:"",
+          pay_way:"",
+          payment:""
+        },
+        isMachine: false, //本次流程是否是机表
+        resolve: undefined,
+        reject: undefined,
+        obj: undefined
+      }
+    },
+    props: ['userInfo', 'cardInfo','stairPrice'],
+    methods: {
+      logo() {
+        return Vue.ProxyUrl + '/res/'+this.$PosUtil.posParam.imgpath+'/sublogo.png'
+      },
+      back(para) {
+        // 返回或者退出，回滚该次事务
+        // this.resolve(false)
+        this.$back(para)
+      },
+      // getQR() {
+      //   this.obj.getQR()
+      // },
+      getAttach(){
+        let attach = {}
+        //tag
+        attach.f_user_id = this.userInfo.f_user_id              //用户ID
+        // attach.f_card_id = self.cardInfo.CardID
+        attach.f_pregas = this.stairPrice.f_pregas          //购气量
+        // attach.f_times = self.cardInfo.Times + 1
+        attach.f_preamount = this.stairPrice.f_preamount
+        attach.f_payment= this.stairPrice.f_payment
+        attach.f_terminal_num = this.$PosUtil.Sn    //设备值 f_operator
+        attach.f_collection = this.stairPrice.f_collection
+        attach.isGasValue = this.userInfo.f_collection_type === '按金额' ? 1 : 0
+        attach.f_totalcost = this.stairPrice.f_totalcost - 0
+        attach.isHand = this.userInfo.f_meter_type ==='机表'? 1 :this.userInfo.f_meter_type ==='物联网表'? -1 :0
+        attach.f_delaypay = this.stairPrice.f_delaypay
+        attach.hand_ids = this.stairPrice.hand_ids
+        if(this.cardInfo.Meterid !== undefined  && this.cardInfo.Meterid !== ''){
+          attach.f_meterid = this.cardInfo.Meterid
+        }
+        if (this.userInfo.f_meter_type !=='机表'&& this.userInfo.f_meter_type !=='物联网表' ){
+          attach.f_card_id = this.cardInfo.CardID
+          attach.f_times =this.cardInfo.Times + 1
+        }
+        // 生产环境金额单位由元  转为分
+        //tag==",attach)
+        return attach
+      },
+      getQR() {
+        //tag
+        if (!this.hadclick) {
+          this.hadclick = true
+          let  attach = this.getAttach()
+          //tag中attach==",attach)
+          let gen = generateScanGen(this,attach)
+          return co(gen)
+        }
+      },
+      payMethod(paymethod) {
+        //tag
+        if(paymethod === 'qrcode'){
+          //tag
+          this.getQR()
+        } else if(paymethod === 'card'){
+          //tag
+          this.cardPay()
+        }else{
+          this.$showMessage(`未知支付方式:${paymethod}，请联系管理员`)
+        }
+      },
+      cardPay() {
+        let data = this.getAttach()
+        try {
+          HostApp.__this__ = this
+          HostApp.pay({
+            data: data,
+            callback: 'javascript:HostApp.__this__.toWriteCard();'
+          })
+        } catch (e) {
+          data.f_serial_id = this.$PosUtil.getBillNum()
+          var gen = testUnionPaySave(this, data)
+          co(gen)
+          this.toWriteCard()
+        }
+
+      },
+      toWriteCard() {
+        this.stairPrice.steps = 1
+        let id = this.$AndroidPlugin.getSellId()
+        this.stairPrice.id = Number(id)
+        this.$goto('order-info', {userInfo: this.userInfo, cardInfo: this.cardInfo, stairPrice: this.stairPrice, status:2,obj: this.obj.next}, 'self', this.back)
+      },
+      pay(str) {
+        //tag
+        if(str==='1'){
+          this.stairPrice.pay_way = this.payBtn1.pay_way
+          this.stairPrice.f_payment = this.payBtn1.payment
+          this.payMethod(this.payBtn1.method)
+        }else if (str === '2') {
+          this.stairPrice.pay_way = this.payBtn2.pay_way
+          this.stairPrice.f_payment = this.payBtn2.payment
+          this.payMethod(this.payBtn2.method)
+        } else {
+          this.stairPrice.pay_way = this.payBtn2.pay_way
+          this.stairPrice.f_payment = this.payBtn2.payment
+          this.payMethod(this.payBtn3.method)
+        }
+      }
+    },
+    ready() {
+      this.cardInfo = this.cardInfo
+      // 服务对象的引用
+      this.obj = this.obj
+      this.userInfo = this.userInfo
+      this.stairPrice = this.stairPrice
+      this.payBtn1 = this.$PosUtil.posParam.PayBtn1   //支付按钮1
+      this.payBtn2 = this.$PosUtil.posParam.PayBtn2   //支付按钮2
+      this.payBtn3 = this.$PosUtil.posParam.PayBtn3 //支付按钮3
+      this.btn1Path =require(`../../image/${this.payBtn1.path}`)
+      this.btn2Path =require(`../../image/${this.payBtn2.path}`)
+      this.btn3Path =require(`../../image/${this.payBtn3.path}`)
+      // 设置服务对象里的组件对象
+      // this.obj.setComponents(this)
+    }
+  }
+
+</script>

package/src/components/pos/charge/sellgas/GudingPrice.vue

@@ -1,38 +1,38 @@
-<template>
-  <div >
-    <table  class="tabprice" >
-      <tr>
-        <td colspan="6" class="lab"><span><img src="../../image/titleicon03.png" width="26" height="26" alt=""/></span> 收费明细</td>
-      </tr>
-      <tr>
-        <td class="lab" align="right">气价类型：</td>
-        <td colspan="2" ><input type="text" value="固定气价" readonly/></td>
-
-      </tr>
-      <tr>
-        <td class="lab" align="right">单位气价：</td>
-        <td  ><input type="number" v-model="stair.chargeprice[0].f_price"  readonly/></td>
-        <td  class="lab" align="right">气量：</td>
-        <td  ><input type="number" v-model="stair.chargeprice[0].f_gas"  readonly/></td>
-        <td  class="lab"  align="right">金额：</td>
-        <td ><input type="number" v-model="stair.chargeprice[0].f_money"  readonly/></td>
-      </tr>
-      <tr>
-        <td colspan="4" ></td>
-        <td class="lab" align="right">总计金额：</td>
-        <td style="font-size: 14px;color: red;"><input type="number" v-model="stair.chargenum" readonly/></td>
-      </tr>
-    </table>
-  </div>
-</template>
-<script>
-export default {
-  title: '固定气价',
-  data () {
-    return {
-      index: 0
-    }
-  },
-  props: ['stair']
-}
-</script>
+<template>
+  <div >
+    <table  class="tabprice" >
+      <tr>
+        <td colspan="6" class="lab"><span><img src="../../image/titleicon03.png" width="26" height="26" alt=""/></span> 收费明细</td>
+      </tr>
+      <tr>
+        <td class="lab" align="right">气价类型：</td>
+        <td colspan="2" ><input type="text" value="固定气价" readonly/></td>
+
+      </tr>
+      <tr>
+        <td class="lab" align="right">单位气价：</td>
+        <td  ><input type="number" v-model="stair.chargeprice[0].f_price"  readonly/></td>
+        <td  class="lab" align="right">气量：</td>
+        <td  ><input type="number" v-model="stair.chargeprice[0].f_gas"  readonly/></td>
+        <td  class="lab"  align="right">金额：</td>
+        <td ><input type="number" v-model="stair.chargeprice[0].f_money"  readonly/></td>
+      </tr>
+      <tr>
+        <td colspan="4" ></td>
+        <td class="lab" align="right">总计金额：</td>
+        <td style="font-size: 14px;color: red;"><input type="number" v-model="stair.chargenum" readonly/></td>
+      </tr>
+    </table>
+  </div>
+</template>
+<script>
+export default {
+  title: '固定气价',
+  data () {
+    return {
+      index: 0
+    }
+  },
+  props: ['stair']
+}
+</script>