shish 5 лет назад
Родитель
Сommit
e4c465861f

+ 2 - 2
ghsApp/src/pagesPurchase/add.vue

@@ -68,8 +68,8 @@
 				<view class="select-view">
 				<view class="select-view">
 					<view class="select-cmd_bx">
 					<view class="select-cmd_bx">
 						<view class="num_bx">
 						<view class="num_bx">
-							<view class="kc">价</view>
-							<allSelectInput :isActive="isAloneAllActive" :isFocus="isAloneAllFocus" :value="customData.itemPrice" :placeholder="'请填写采购总价'"
+							<view class="kc">价</view>
+							<allSelectInput :isActive="isAloneAllActive" :isFocus="isAloneAllFocus" :value="customData.itemPrice" :placeholder="'采购金额'"
 																							:width="416" :height="80" :fontSize="40"
 																							:width="416" :height="80" :fontSize="40"
 																							@deleteInputVal="deleteAloneInputVal" @initAllInput="initAloneAllInput" @moveAllInput="moveAloneAllInput">
 																							@deleteInputVal="deleteAloneInputVal" @initAllInput="initAloneAllInput" @moveAllInput="moveAloneAllInput">
 							</allSelectInput> <text style="margin-left: 20rpx">元</text>
 							</allSelectInput> <text style="margin-left: 20rpx">元</text>

+ 3 - 3
ghsApp/src/pagesPurchase/details.vue

@@ -116,11 +116,11 @@
 					</tui-list-cell>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
 					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title ">实付金额</view>
 						<view class="tui-title ">实付金额</view>
-						<input style="border: 1px solid #eee;color: #3385FF;width: calc(100%);"  type="digit" :disabled="!canIEdit"  @focus="realMoney=''" v-model="realMoney" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写,留空没有费用"/>
+						<input style="border: 1px solid #eee;color: #3385FF;width: calc(100%);height:70rpx;"  type="digit" :disabled="!canIEdit"  @focus="realMoney=''" v-model="realMoney" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写,留空没有费用"/>
 					</tui-list-cell>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
 					<tui-list-cell class="line-cell" :hover="false">
-						<view class="tui-title ">损减免</view>
-						<view>{{totalPrice - realMoney }}</view>
+						<view class="tui-title ">损减免</view>
+						<view>{{(totalPrice - realMoney).toFixed(2) }}</view>
 					</tui-list-cell>
 					</tui-list-cell>
 
 
 					<tui-list-cell class="line-cell remark-wrap" :hover="false">
 					<tui-list-cell class="line-cell remark-wrap" :hover="false">

+ 3 - 3
hdApp/src/admin/recharge/renew.vue

@@ -2,13 +2,13 @@
   <div class="app-content">
   <div class="app-content">
     <div class="recharge_box">
     <div class="recharge_box">
       <view class="renew">
       <view class="renew">
-        续费<text style="padding-left: 10upx;">{{initData.renew}}</text>/年<text
+        续期<text>{{initData.renew}}</text>元<text
           class="toBuy"
           class="toBuy"
           @click="goBuy"
           @click="goBuy"
-        >去购买</text>
+        >选择</text>
       </view>
       </view>
       <view class="voucher">
       <view class="voucher">
-        充值<text style="color: #FF3C00;padding-left: 10upx;">{{initData.recharge}}元</text>,免费使用一年
+        充值<text style="color: #FF3C00">{{initData.recharge}}</text>元花款,免费续期一年
       </view>
       </view>
       <view>
       <view>
         <picker @change="startTimeFn" class="tui-input" :range="ghsList" range-key="name" :value="selectIndex">
         <picker @change="startTimeFn" class="tui-input" :range="ghsList" range-key="name" :value="selectIndex">

+ 0 - 1
hdApp/src/pagesClient/official/renewal.vue

@@ -76,7 +76,6 @@ export default {
       });
       });
     },
     },
     payFail() {
     payFail() {
-      this.$msg("支付失败");
     }
     }
   }
   }
 };
 };

+ 2 - 2
hdApp/src/pagesPurchase/add.vue

@@ -100,13 +100,13 @@
 					<view class="select-cmd_bx">
 					<view class="select-cmd_bx">
 						<view class="num_bx">
 						<view class="num_bx">
 							<view class="kc">
 							<view class="kc">
-								价
+								
 							</view>
 							</view>
 <!--							<input-->
 <!--							<input-->
 <!--								:value="customData.itemPrice"-->
 <!--								:value="customData.itemPrice"-->
 <!--								@change="changePriceEvent"-->
 <!--								@change="changePriceEvent"-->
 <!--								type="number"-->
 <!--								type="number"-->
-<!--								placeholder="请填写采购总价"-->
+<!--								placeholder="采购金额"-->
 <!--							/>元-->
 <!--							/>元-->
 							<allSelectInput :isActive="isAloneAllActive" :isFocus="isAloneAllFocus" :value="customData.itemPrice" :placeholder="'采购总价'"
 							<allSelectInput :isActive="isAloneAllActive" :isFocus="isAloneAllFocus" :value="customData.itemPrice" :placeholder="'采购总价'"
 																							@deleteInputVal="deleteAloneInputVal" @initAllInput="initAloneAllInput" @moveAllInput="moveAloneAllInput">
 																							@deleteInputVal="deleteAloneInputVal" @initAllInput="initAloneAllInput" @moveAllInput="moveAloneAllInput">

+ 0 - 1
mallApp/src/pages/class/index.vue

@@ -107,7 +107,6 @@ export default{
       })
       })
     },
     },
     errorFn() {
     errorFn() {
-      this.$msg('支付失败')
     },
     },
      // 获取微信手机号
      // 获取微信手机号
     getWxMobile(e) {
     getWxMobile(e) {