充值卡

www/vue/src/components/CompanyProfile/brand.vue

@@ -4,7 +4,7 @@
 </div>
 </template>
 
-<script type="es6">
+<script>
 export default {
 }
 </script>

www/vue/src/components/CompanyProfile/documents.vue

@@ -4,7 +4,7 @@
 </div>
 </template>
 
-<script type="es6">
+<script>
 export default {
 }
 </script>

www/vue/src/components/CompanyProfile/housekeeper.vue

@@ -4,7 +4,7 @@
 </div>
 </template>
 
-<script type="es6">
+<script>
 export default {
 }
 </script>

www/vue/src/components/CompanyProfile/indemnity.vue

@@ -4,7 +4,7 @@
 </div>
 </template>
 
-<script type="es6">
+<script>
 export default {
 }
 </script>

www/vue/src/components/CompanyProfile/tool.vue

@@ -4,7 +4,7 @@
 </div>
 </template>
 
-<script type="es6">
+<script>
 export default {
 }
 </script>

www/vue/src/components/about.vue

@@ -3,7 +3,7 @@
 	</div>
 </template>
 
-<script type="es6">
+<script>
   import axios from 'axios'
   export default{
     data () {

www/vue/src/components/activityText.vue

@@ -31,7 +31,7 @@
 	</div>
 </template>
 
-<script type="es6">
+<script>
   export default {}
 </script>
 

www/vue/src/components/address/addresList.vue

@@ -16,7 +16,7 @@
     <alert v-model="showAlert" :title="(alertTitle)"> {{ (alertContent) }}</alert>
   </div>
 </template>
-<script type="es6">
+<script>
   import config from '../../config/config'
   import axios from 'axios'
   import {Alert} from 'vux'

www/vue/src/components/address/addressAdd.vue

@@ -31,7 +31,7 @@
   </div>
 </template>
 
-<script type="es6">
+<script>
   import {XInput, Group, Cell, Alert, TransferDomDirective as TransferDom} from 'vux'
   import config from '../../config/config'
   import axios from 'axios'

www/vue/src/components/address/addressDetail.vue

@@ -30,7 +30,7 @@
   </div>
 </template>
 
-<script type="es6">
+<script>
   import {XInput, Group, Cell, Alert, TransferDomDirective as TransferDom} from 'vux'
   import config from '../../config/config'
   import axios from 'axios'

www/vue/src/components/address/addressPoisiton.vue

@@ -18,7 +18,7 @@
   </div>
 </template>
 
-<script type="es6">
+<script>
   import {Search, Group, Cell, XButton} from 'vux'
   import axios from 'axios'
   import config from '../../config/config'

www/vue/src/components/balanceLog.vue

@@ -15,22 +15,22 @@
 			<div class="btn-recharge" @click="recharge">充值</div>
 			<button-tab>
 				<button-tab-item selected @on-item-click="consoleIndex(1)" ref="reset">充值</button-tab-item>
-				<button-tab-item  @on-item-click="consoleIndex(2)">消费</button-tab-item>
+				<button-tab-item @on-item-click="consoleIndex(2)">消费</button-tab-item>
 			</button-tab>
 		</div>
 		<div style="margin-top: 165px;">
 			<div style="color: #0b0b0b" v-for="(item, index) in tmp">
-
+				
 				<group>
 					<cell
-							:title="item.time"
-							is-link
-							value-align="left"
-							:border-intent="false"
-							:arrow-direction="isActive === index ? 'up' : 'down'" @click.native="show(index)"></cell>
+						:title="item.time"
+						is-link
+						value-align="left"
+						:border-intent="false"
+						:arrow-direction="isActive === index ? 'up' : 'down'" @click.native="show(index)"></cell>
 					<p class="slide" :class="{ animate: isActive == index }">
 						<span v-if="frontColor" style="display: block;text-align: left;color: green;">充值金额:{{item.amount}}</span>
-						<span v-else style="display: block;text-align: left;color: red;" >消费金额:{{item.amount}}</span>
+						<span v-else style="display: block;text-align: left;color: red;">消费金额:{{item.amount}}</span>
 						<span style="display: block;text-align: left;">支付用途:{{item.memo}}</span>
 						<span style="display: block;text-align: left;">交易类型:{{item.type_str}}</span>
 					</p>
@@ -63,7 +63,7 @@
 	</div>
 </template>
 
-<script type="es6">
+<script>
   import {Tab, TabItem, ButtonTab, ButtonTabItem, Sticky, Cell, Group} from 'vux'
   import axios from 'axios'
   import qs from 'qs'
@@ -81,7 +81,7 @@
         tmpL: -1,
         timeStatus: {},
         moduleShow: false,
-	      frontColor: 1,
+        frontColor: 1,
         isSelected: true
       }
     },
@@ -108,7 +108,7 @@
         this.moduleShow = false
         this.consoleIndex(1)
         this.isSelected = true
-	      this.$refs.reset.onItemClick()
+        this.$refs.reset.onItemClick()
         console.log(this.isSelected)
       },
       modalTime (index) {
@@ -146,11 +146,11 @@
         } else {
           this.frontColor = 0
         }
-				let balanceInfo = {
-				 id: config.userId,
-				 start_time: this.year + '-' + this.month + '-01',
-				 end_time: this.year + '-' + this.month + '-30',
-				 }
+        let balanceInfo = {
+          id: config.userId,
+          start_time: this.year + '-' + this.month + '-01',
+          end_time: this.year + '-' + this.month + '-30'
+        }
         //  let balanceInfo = {id: config.userId, start_time: '2016-11-01', end_time: '2016-11-30'}
         this.balanceList(index, balanceInfo)
       },
@@ -262,7 +262,7 @@
 			border: 1px solid rgb(197, 159, 0);
 		}
 	}
-
+	
 	.balance-content {
 		background-color: green;
 		padding: 5%;
@@ -270,14 +270,14 @@
 		font-size: 25px;
 		// border-radius: 15px;
 	}
-
+	
 	.vux-button-group {
 		margin-top: 66px;
 		& > a.vux-button-group-current {
 			background-color: #927603 !important;
 		}
 	}
-
+	
 	.recharge-details {
 		width: 100%;
 		margin-bottom: 10px;
@@ -331,7 +331,7 @@
 			border-bottom: 1px solid rgba(0, 0, 0, 0.3);
 		}
 	}
-
+	
 	/*	.show {
 			background-color: black;
 			height: 500px;
@@ -349,13 +349,13 @@
 		max-height: 0;
 		transition: max-height .5s cubic-bezier(0, 1, 0, 1) -.1s;
 	}
-
+	
 	.animate {
 		max-height: 9999px;
 		transition-timing-function: cubic-bezier(0.5, 0, 1, 0);
 		transition-delay: 0s;
 	}
-
+	
 	/*模态框*/
 	.o2o-modal {
 		top: 0;
@@ -427,14 +427,14 @@
 			}
 		}
 	}
-
+	
 	/*模态框动画*/
 	.modal-start {
 		overflow: hidden;
 		max-height: 0;
 		transition: max-height .5s cubic-bezier(0, 1, 0, 1) -.1s;
 	}
-
+	
 	.modalEnd {
 		max-height: 9999px;
 		transition-timing-function: cubic-bezier(0.5, 0, 1, 0);

www/vue/src/components/completeOrder.vue

@@ -12,7 +12,7 @@
 	</div>
 </template>
 
-<script type="es6">
+<script>
   export default {
     created () {
 

www/vue/src/components/home.vue

@@ -23,7 +23,7 @@
   </div>
 </template>
 
-<script type="es6">
+<script>
   import {mapState, mapActions} from 'vuex'
   import {XSwitch} from 'vux'
   export default {

www/vue/src/components/homeList.vue

@@ -14,7 +14,7 @@
   </div>
 </template>
 
-<script type="es6">
+<script>
   import config from '../config/config'
   import product from '../config/product'
   export default {

www/vue/src/components/myCoupon.vue

@@ -4,7 +4,7 @@
 </div>
 </template>
 
-<script type="es6">
+<script>
 export default {
 }
 </script>

www/vue/src/components/navTitle.vue

@@ -2,7 +2,7 @@
   <div class="navTitle">{{navTitle}}</div>
 </template>
 
-<script type="es6">
+<script>
 export default {
   name: 'navTitle',
   data () {

www/vue/src/components/navigation.vue

@@ -30,7 +30,7 @@
   </div>
 </template>
 
-<script type="es6">
+<script>
   import {Tabbar, TabbarItem, Group, Cell} from 'vux'
   export default {
     name: 'navigation',

www/vue/src/components/order.vue

@@ -67,7 +67,7 @@
 
 </template>
 
-<script type="es6">
+<script>
   import { ButtonTab, ButtonTabItem, Divider, XDialog, TransferDomDirective as TransferDom } from 'vux'
   import axios from 'axios'
   import qs from 'qs'

www/vue/src/components/orderInfo.vue

@@ -70,7 +70,7 @@
 
 </template>
 
-<script type="es6">
+<script>
   import { Cell, CellBox, CellFormPreview, FormPreview, Group, Badge, XDialog, TransferDomDirective as TransferDom } from 'vux'
   import axios from 'axios'
   import config from '../config/config'

www/vue/src/components/pay.vue

@@ -20,8 +20,8 @@
   export default {
     data () {
       return {
-        orderType: '充值3000元',
-        payType: '3000元'
+        orderType: '',
+        payType: ''
       }
     },
     components: {
@@ -30,6 +30,8 @@
     },
     created () {
       console.log(this.$route.query.payRecharge)
+      this.orderType = this.$route.query.payRecharge.products
+      this.payType = this.$route.query.payRecharge.final_price
     }
   }
 </script>

www/vue/src/components/placeOrder.vue

@@ -1,67 +1,67 @@
 <template>
-  <div class="place-order">
-    <scroller>
-      <img :src="productBox.pics[0].url" alt="">
-      <!--extra-->
-      <div class="extra">
-        <div v-if="extraB" v-for="(itemExtra,index) in productBox.extra" @click="btnAction(index, $event)">
-          <div class="extra-text" v-bind:class="{active: index == isActive}">
-            {{itemExtra.type}}
-          </div>
-        </div>
-      </div>
-      <!--选择数量-->
-      <group>
-        <x-number title="选择数量" v-model="xNumberValue" :value="0" :min="0" @on-change="xNumberValueChange"
-                  fillable></x-number>
-      </group>
-      <!--选择时间-->
-      <group>
-        <datetime v-model="bookingTime" :placeholder="(bookingTime)" :max-year=2017 format="YYYY-MM-DD HH:00"
-                  @on-change="change" :title="('服务时间')" year-row="{value}年" month-row="{value}月" day-row="{value}日"
-                  hour-row="{value}点" minute-row="{value}分" confirm-text="完成" cancel-text="取消" :start-date='startDate'
-                  :end-date='endDate' :min-hour=9 :max-hour=18></datetime>
-      </group>
-      <!--选择地址-->
-      <div class="weui-cells vux-no-group-title">
-        <div class="vux-datetime weui-cell weui-cell_access" @click="clearConfig">
-          <div>
-            <p>选择地址</p>
-          </div>
-          <div class="weui-cell__ft vux-cell-primary vux-datetime-value address-info">
-            <span>{{addressContent.name}}</span><span>{{addressContent.mobile}}</span>
-            <p>{{addressContent.address.city}}&nbsp;{{addressContent.address.area}}&nbsp;{{addressContent.address.detail}}</p>
-          </div>
-        </div>
-      </div>
-      <!--优惠券-->
-      <group>
-        <cell class="address" title="优惠券" :value="couponName" isLink @click="selectCoupon()"></cell>
-      </group>
-      <!--备注-->
-      <group>
-        <x-textarea class="remarks" :placeholder="('可填写附加内容')" inline-desc="备注："
-                    v-model="remarks" :show-counter="true" :rows="1"
-                    autosize></x-textarea>
-      </group>
-      <div style="width: 100%;padding-bottom: 15%;"></div>
-    </scroller>
-    <!--下单-->
-    <div class="btn">
-      <!--费用总计-->
-      <div class="order-amount">
-        <span>费用总计：</span>
-        <span>{{orderPrice}}</span>
-      </div>
-      <!--确认预约-->
-      <div class="btn-order" v-on:click="btnOrder">立即下单</div>
-    </div>
-    <!--展示报错信息-->
-    <alert v-model="showAlert" :title="(alertTitle)"> {{ (alertContent) }}</alert>
-  </div>
+	<div class="place-order">
+		<scroller>
+			<img :src="productBox.pics[0].url" alt="">
+			<!--extra-->
+			<div class="extra">
+				<div v-if="extraB" v-for="(itemExtra,index) in productBox.extra" @click="btnAction(index, $event)">
+					<div class="extra-text" v-bind:class="{active: index == isActive}">
+						{{itemExtra.type}}
+					</div>
+				</div>
+			</div>
+			<!--选择数量-->
+			<group>
+				<x-number title="选择数量" v-model="xNumberValue" :value="0" :min="0" @on-change="xNumberValueChange"
+				          fillable></x-number>
+			</group>
+			<!--选择时间-->
+			<group>
+				<datetime v-model="bookingTime" :placeholder="(bookingTime)" :max-year=2017 format="YYYY-MM-DD HH:00"
+				          @on-change="change" :title="('服务时间')" year-row="{value}年" month-row="{value}月" day-row="{value}日"
+				          hour-row="{value}点" minute-row="{value}分" confirm-text="完成" cancel-text="取消" :start-date='startDate'
+				          :end-date='endDate' :min-hour=9 :max-hour=18></datetime>
+			</group>
+			<!--选择地址-->
+			<div class="weui-cells vux-no-group-title">
+				<div class="vux-datetime weui-cell weui-cell_access" @click="clearConfig">
+					<div>
+						<p>选择地址</p>
+					</div>
+					<div class="weui-cell__ft vux-cell-primary vux-datetime-value address-info">
+						<span>{{addressContent.name}}</span><span>{{addressContent.mobile}}</span>
+						<p>{{addressContent.address.city}}&nbsp;{{addressContent.address.area}}&nbsp;{{addressContent.address.detail}}</p>
+					</div>
+				</div>
+			</div>
+			<!--优惠券-->
+			<group>
+				<cell class="address" title="优惠券" :value="couponName" isLink @click="selectCoupon()"></cell>
+			</group>
+			<!--备注-->
+			<group>
+				<x-textarea class="remarks" :placeholder="('可填写附加内容')" inline-desc="备注："
+				            v-model="remarks" :show-counter="true" :rows="1"
+				            autosize></x-textarea>
+			</group>
+			<div style="width: 100%;padding-bottom: 15%;"></div>
+		</scroller>
+		<!--下单-->
+		<div class="btn">
+			<!--费用总计-->
+			<div class="order-amount">
+				<span>费用总计：</span>
+				<span>{{orderPrice}}</span>
+			</div>
+			<!--确认预约-->
+			<div class="btn-order" v-on:click="btnOrder">立即下单</div>
+		</div>
+		<!--展示报错信息-->
+		<alert v-model="showAlert" :title="(alertTitle)"> {{ (alertContent) }}</alert>
+	</div>
 </template>
 
-<script type="es6">
+<script>
   import config from '../config/config'
   import selectTime from '../config/selectTime'
   import {Group, DatetimeRange, TransferDom, Datetime, XNumber, Cell, CellBox, XTextarea, Alert} from 'vux'
@@ -87,7 +87,7 @@
         alertContent: '', // 弹窗内容
         couponName: '暂无优惠券',  //  优惠券名称
         couponValue: 0,  //  优惠券名称
-	      CouponProduct: {},
+        CouponProduct: {}
       }
     },
     // 指令
@@ -172,7 +172,7 @@
         }
       },
       selectCoupon () {
-        if (this.products ) {
+        if (this.products) {
 
         }
       },
@@ -260,95 +260,95 @@
 </script>
 
 <style lang="less" scoped>
-  /*订单背景色*/
-  .place-order {
-  }
-
-  /*类目*/
-  .extra {
-    display: flex;
-    flex-wrap: wrap;
-    padding: 0 15px;
-    background-color: #fff;
-  }
-
-  .extra > div {
-    width: 50%;
-  }
-
-  .extra-text {
-    border: 1px solid #000;
-    font-size: 0.8rem;
-    transition-duration: 95ms;
-    margin: 10px;
-    padding: 5px;
-    color: #929292;
-  }
-
-  .active {
-    border-color: rgb(13, 12, 8);
-    color: #fff;
-    background: #000;
-  }
-
-  /*选择地址*/
-  .address {
-    text-align: left;
-  }
-
-  .address-info {
-    span {
-      font-size: 13px;
-      &:nth-child(1) {
-        margin-right: 5px;
-      }
-    }
-    p {
-      font-size: 13px;
-    }
-  }
-
-  /*填写备注*/
-  .remarks {
-    textarea {
-      background-color: #f5f5f5;
-    }
-  }
-
-  /*下单样式*/
-  .btn {
-    position: fixed;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    border-top: 1px solid rgba(0, 0, 0, 0.1);
-    background-color: #ffffff;
-    height: 2.5rem;
-    .order-amount {
-      padding-left: 15px;
-      float: left;
-      width: 50%;
-      font-size: 16px;
-      text-align: left;
-      line-height: 2.5rem;
-      span:nth-child(2) {
-        color: red;
-      }
-    }
-    .btn-order {
-      padding: 3%;
-      width: 30%;
-      float: right;
-      margin: 0 auto;
-      background-color: #927603;
-      border: 1px solid #a78b03;
-      color: #ffffff;
-      font-size: 18px;
-    }
-  }
-
-  img {
-    display: block;
-    width: 100%;
-  }
+	/*订单背景色*/
+	.place-order {
+	}
+	
+	/*类目*/
+	.extra {
+		display: flex;
+		flex-wrap: wrap;
+		padding: 0 15px;
+		background-color: #fff;
+	}
+	
+	.extra > div {
+		width: 50%;
+	}
+	
+	.extra-text {
+		border: 1px solid #000;
+		font-size: 0.8rem;
+		transition-duration: 95ms;
+		margin: 10px;
+		padding: 5px;
+		color: #929292;
+	}
+	
+	.active {
+		border-color: rgb(13, 12, 8);
+		color: #fff;
+		background: #000;
+	}
+	
+	/*选择地址*/
+	.address {
+		text-align: left;
+	}
+	
+	.address-info {
+		span {
+			font-size: 13px;
+			&:nth-child(1) {
+				margin-right: 5px;
+			}
+		}
+		p {
+			font-size: 13px;
+		}
+	}
+	
+	/*填写备注*/
+	.remarks {
+		textarea {
+			background-color: #f5f5f5;
+		}
+	}
+	
+	/*下单样式*/
+	.btn {
+		position: fixed;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		border-top: 1px solid rgba(0, 0, 0, 0.1);
+		background-color: #ffffff;
+		height: 2.5rem;
+		.order-amount {
+			padding-left: 15px;
+			float: left;
+			width: 50%;
+			font-size: 16px;
+			text-align: left;
+			line-height: 2.5rem;
+			span:nth-child(2) {
+				color: red;
+			}
+		}
+		.btn-order {
+			padding: 3%;
+			width: 30%;
+			float: right;
+			margin: 0 auto;
+			background-color: #927603;
+			border: 1px solid #a78b03;
+			color: #ffffff;
+			font-size: 18px;
+		}
+	}
+	
+	img {
+		display: block;
+		width: 100%;
+	}
 </style>

www/vue/src/components/product.vue

@@ -16,7 +16,7 @@
   </div>
 </template>
 
-<script type="es6">
+<script>
   import config from '../config/config'
   import {mapState, mapActions} from 'vuex'
   import {XImg} from 'vux'

www/vue/src/components/recharge.vue

@@ -127,10 +127,18 @@
         let payRecharge = {}
         axios.post('o2o/recharge/addRechargeorder', qs.stringify(addRechargeOrder)).then(res => {
           if (res.data.success) {
+            console.log(res.data.data.price)
+            let payValue = ''
+            if (this.otherAmount === '' && this.isShow !== 4) {
+              payValue = this.rechargeItem.denomination
+            } else {
+              payValue = this.otherAmount
+            }
             payRecharge = {
-              user_id: res.data.data.user.$id,
+              final_price: res.data.data.price,
               pay_channel: 'wx_pub',
-              order_id: res.data.data._id.$id
+              order_id: res.data.data._id.$id,
+              products: '充值' + payValue + '元'
             }
             this.$router.push({path: '/pay', query: {payRecharge: payRecharge}})
           }

www/vue/src/components/selectTime.vue

@@ -17,7 +17,7 @@
   </div>
 </template>
 
-<script type="es6">
+<script>
   export default {
     name: 'selectTime',
     data () {

www/vue/src/components/swiper.vue

@@ -10,7 +10,7 @@
     <!--<div class="swiper-scrollbar"   slot="scrollbar"></div>-->
   </swiper>
 </template>
-<script type="es6">
+<script>
 import { swiper, swiperSlide } from 'vue-awesome-swiper'
 export default {
   name: 'carrousel',

www/vue/src/components/userCoupon.vue

@@ -51,7 +51,7 @@
 	</div>
 </template>
 
-<script type="es6">
+<script>
   import axios from 'axios'
   import config from '../config/config'
   import { XDialog, TransferDomDirective as TransferDom } from 'vux'