花材

ghsApp/src/admin/item/detail.vue

@@ -16,43 +16,23 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">拼音缩写</div>
-          <input
-            v-model="form.py"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="py"
-            placeholder="请填写拼音首字母缩写"
-            maxlength="50"
-            type="text"
-          />
+          <input v-model="form.py" placeholder-class="phcolor" class="tui-input" name="py" placeholder="请填写拼音首字母缩写" maxlength="50" type="text" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">售价</div>
-          <input
-            v-model="form.price"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="price"
-            @focus="form.price=''"
-            placeholder="请填写售价"
-            maxlength="50"
-            type="digit"
-          />
+          <input v-model="form.price" placeholder-class="phcolor" class="tui-input" name="price" @focus="form.price=''" placeholder="请填写售价" maxlength="50" type="digit" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">今日特价</div>
-          <input
-            v-model="form.discountPrice"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="discountPrice"
-            @focus="form.discountPrice=''"
-            placeholder="没有特价填0"
-            maxlength="50"
-            type="digit"
-          />
+          <input v-model="form.discountPrice" placeholder-class="phcolor" class="tui-input" name="discountPrice" @focus="form.discountPrice=''" placeholder="没有特价填0" maxlength="50" type="digit" />
+        </tui-list-cell>
+
+        <tui-list-cell class="line-cell" :hover="false">
+          <div class="tui-title">单支价格倍数</div>
+          <input v-model="form.smallRatio" placeholder-class="phcolor" class="tui-input" name="smallRatio" placeholder="请填写" style="width:330upx;" @focus="form.smallRatio=''"
+          maxlength="50" type="number" /><text style="color:#666666;">¥<text>{{smallPrice}}</text></text>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
@@ -63,14 +43,7 @@
 
         <tui-list-cell class="line-cell" :arrow="true">
           <div class="tui-title">分类</div>
-          <picker
-            mode="selector"
-            :value="form.classId"
-            :range="itemClassData"
-            range-key="name"
-            @change="changeItemClassFn"
-            class="tui-input"
-          >
+          <picker mode="selector" :value="form.classId" :range="itemClassData" range-key="name" @change="changeItemClassFn" class="tui-input" >
             <input v-model="form.classId" name="classId" type="text" hidden />
             <div v-if="form.classId" style="height:45upx;" >{{ itemClassSelectedData.name }}</div>
             <div class="tui-placeholder" style="height:45upx;" v-else>请选择</div>
@@ -79,14 +52,7 @@
 
         <tui-list-cell class="line-cell" :arrow="true">
           <div class="tui-title">大单位</div>
-          <picker
-            mode="selector"
-            :value="form.bigUnitId"
-            :range="unitData"
-            range-key="name"
-            @change="changeBigUnitFn"
-            class="tui-input"
-          >
+          <picker mode="selector" :value="form.bigUnitId" :range="unitData" range-key="name" @change="changeBigUnitFn" class="tui-input" >
             <input v-model="form.bigUnitId" name="bigUnitId" type="text" hidden />
             <div v-if="form.bigUnitId">{{ bigUnitSelectedData.name }}</div>
             <div class="tui-placeholder" style="height:45upx;" v-else>请选择</div>
@@ -95,14 +61,7 @@
 
         <tui-list-cell class="line-cell" :arrow="true">
           <div class="tui-title">小单位</div>
-          <picker
-            mode="selector"
-            :value="form.smallUnitId"
-            :range="unitData"
-            range-key="name"
-            @change="changeSmallUnitFn"
-            class="tui-input"
-          >
+          <picker mode="selector" :value="form.smallUnitId" :range="unitData" range-key="name" @change="changeSmallUnitFn" class="tui-input" >
             <input v-model="form.smallUnitId" name="smallUnitId" type="text" hidden />
             <div v-if="form.smallUnitId">{{ smallUnitSelectedData.name }}</div>
             <div class="tui-placeholder" v-else>请选择</div>
@@ -111,107 +70,34 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">散客加价</div>
-          <input
-            v-model="form.skAddPrice"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="skAddPrice"
-            @focus="form.skAddPrice=''"
-            placeholder="请填写散客加价"
-            maxlength="50"
-            type="digit"
-          />
+          <input v-model="form.skAddPrice" placeholder-class="phcolor" class="tui-input" name="skAddPrice" @focus="form.skAddPrice=''" placeholder="请填写" maxlength="50" type="digit" />
         </tui-list-cell>
         <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">普店加价</div>
-          <input
-            v-model="form.addPrice"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="addPrice"
-            @focus="form.addPrice=''"
-            placeholder="请填写普店加价"
-            maxlength="50"
-            type="digit"
-          />
+          <input v-model="form.addPrice" placeholder-class="phcolor" class="tui-input" name="addPrice" @focus="form.addPrice=''" placeholder="请填写" maxlength="50" type="digit" />
         </tui-list-cell>
         <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">银店加价</div>
-          <input
-            v-model="form.hjAddPrice"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="hjAddPrice"
-            @focus="form.hjAddPrice=''"
-            placeholder="请填写银店加价"
-            maxlength="50"
-            type="digit"
-          />
+          <input v-model="form.hjAddPrice" placeholder-class="phcolor" class="tui-input" name="hjAddPrice" @focus="form.hjAddPrice=''" placeholder="请填写" maxlength="50" type="digit" />
         </tui-list-cell>
         <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">金店加价</div>
-          <input
-            v-model="form.zsAddPrice"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="zsAddPrice"
-            @focus="form.zsAddPrice=''"
-            placeholder="请填写金店加价"
-            maxlength="50"
-            type="digit"
-          />
+          <input v-model="form.zsAddPrice" placeholder-class="phcolor" class="tui-input" name="zsAddPrice" @focus="form.zsAddPrice=''" placeholder="请填写" maxlength="50" type="digit" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">单位比</div>
-          <input
-            v-model="form.ratio"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="ratio"
-            placeholder="如：1扎=20支，请填写20"
-            maxlength="50"
-            type="number"
-          />
-        </tui-list-cell>
-
-        <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">零售价系数</div>
-          <input
-            v-model="form.smallRatio"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="smallRatio"
-            placeholder=""
-            maxlength="50"
-            type="number"
-          />
+          <input v-model="form.ratio" disabled="true" placeholder-class="phcolor" class="tui-input" name="ratio" placeholder="如：1扎=20支，请填写20" maxlength="50" type="number" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">每扎重量</div>
-          <input
-            v-model="form.weight"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="weight"
-            placeholder="单位：公斤"
-            maxlength="50"
-            type="digit"
-          />
+          <input v-model="form.weight" disabled="true" placeholder-class="phcolor" class="tui-input" name="weight" placeholder="单位：公斤" maxlength="50" type="digit" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">库存预警值</div>
-          <input
-            v-model="form.stockWarning"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="stockWarning"
-            placeholder="请填写"
-            maxlength="50"
-            type="number"
-          />
+          <input v-model="form.stockWarning" placeholder-class="phcolor" class="tui-input" name="stockWarning" placeholder="请填写" maxlength="50" type="number" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
@@ -311,6 +197,15 @@ export default {
   },
 	computed:{
 		...mapGetters(["getLoginInfo","getDictionariesInfo"]),
+    smallPrice(){
+       let price = 0
+        if(this.form.price){
+          let div = this.$util.div(this.form.price,this.form.ratio)
+          price = this.$util.mul(div,this.form.smallRatio)
+          price = parseFloat(price.toFixed(2))
+        }
+        return price
+    }
 	},
   onLoad(option) {
     if(option.id){
@@ -572,7 +467,7 @@ export default {
         {
           name: "smallRatio",
           rule: ["required"],
-          msg: ["请填写零售价系数"]
+          msg: ["请填写单支价格倍数"]
         },
         {
           name: "price",

hdApp/src/admin/item/detail.vue

@@ -1,6 +1,5 @@
 <template>
   <view class="app-content">
-    <!-- 花材基本信息 -->
     <form @submit="formSubmit">
       <view class="module-com input-line-wrap">
 
@@ -16,43 +15,23 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">拼音缩写</view> 
-          <input
-            v-model="form.py"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="py"
-            placeholder="请填写拼音首字母缩写"
-            maxlength="50"
-            type="text"
-          />
+          <input v-model="form.py" placeholder-class="phcolor" class="tui-input" name="py" placeholder="请填写字母" maxlength="50" type="text" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">售价</view> 
-          <input
-            v-model="form.price"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="price"
-            @focus="form.price=''"
-            placeholder="请填写售价"
-            maxlength="50"
-            type="digit"
-          />
+          <input v-model="form.skPrice" placeholder-class="phcolor" class="tui-input" name="skPrice" @focus="form.skPrice=''" placeholder="请填写售价" maxlength="50" type="digit" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">今日特价</view> 
-          <input
-            v-model="form.discountPrice"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="discountPrice"
-            @focus="form.discountPrice=''"
-            placeholder="没有特价填0"
-            maxlength="50"
-            type="digit"
-          />
+          <view class="tui-title">单支价格倍数</view> 
+          <input v-model="form.smallRatio" placeholder-class="phcolor" class="tui-input" name="smallRatio" style="width:330upx;" @focus="form.smallRatio=''"
+           placeholder="请填写" maxlength="30" type="number" /><text style="color:#666666;">¥<text>{{smallPrice}}</text></text>
+        </tui-list-cell>
+
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">加价</view> 
+          <input v-model="form.skAddPrice" placeholder-class="phcolor" class="tui-input" name="skAddPrice" @focus="form.skAddPrice=''" placeholder="请填写加价" maxlength="50" type="digit" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
@@ -63,14 +42,7 @@
 
         <tui-list-cell class="line-cell" :arrow="true">
           <view class="tui-title">分类</view> 
-          <picker
-            mode="selector"
-            :value="form.classId"
-            :range="itemClassData"
-            range-key="name"
-            @change="changeItemClassFn"
-            class="tui-input"
-          >
+          <picker mode="selector" :value="form.classId" :range="itemClassData" range-key="name" @change="changeItemClassFn" class="tui-input" >
             <input v-model="form.classId" name="classId" type="text" hidden />
             <view v-if="form.classId" style="height:45upx;" >{{ itemClassSelectedData.name }}</view> 
             <view class="tui-placeholder" style="height:45upx;" v-else>请选择</view> 
@@ -79,14 +51,7 @@
 
         <tui-list-cell class="line-cell" :arrow="true">
           <view class="tui-title">大单位</view> 
-          <picker
-            mode="selector"
-            :value="form.bigUnitId"
-            :range="unitData"
-            range-key="name"
-            @change="changeBigUnitFn"
-            class="tui-input"
-          >
+          <picker mode="selector" :value="form.bigUnitId" :range="unitData" range-key="name" @change="changeBigUnitFn" class="tui-input" >
             <input v-model="form.bigUnitId" name="bigUnitId" type="text" hidden />
             <view v-if="form.bigUnitId">{{ bigUnitSelectedData.name }}</view> 
             <view class="tui-placeholder" style="height:45upx;" v-else>请选择</view> 
@@ -95,123 +60,26 @@
 
         <tui-list-cell class="line-cell" :arrow="true">
           <view class="tui-title">小单位</view> 
-          <picker
-            mode="selector"
-            :value="form.smallUnitId"
-            :range="unitData"
-            range-key="name"
-            @change="changeSmallUnitFn"
-            class="tui-input"
-          >
+          <picker mode="selector" :value="form.smallUnitId" :range="unitData" range-key="name" @change="changeSmallUnitFn" class="tui-input" >
             <input v-model="form.smallUnitId" name="smallUnitId" type="text" hidden />
             <view v-if="form.smallUnitId">{{ smallUnitSelectedData.name }}</view> 
             <view class="tui-placeholder" v-else>请选择</view> 
           </picker>
         </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">散客加价</view> 
-          <input
-            v-model="form.skAddPrice"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="skAddPrice"
-            @focus="form.skAddPrice=''"
-            placeholder="请填写散客加价"
-            maxlength="50"
-            type="digit"
-          />
-        </tui-list-cell>
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">普店加价</view> 
-          <input
-            v-model="form.addPrice"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="addPrice"
-            @focus="form.addPrice=''"
-            placeholder="请填写普店加价"
-            maxlength="50"
-            type="digit"
-          />
-        </tui-list-cell>
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">银店加价</view> 
-          <input
-            v-model="form.hjAddPrice"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="hjAddPrice"
-            @focus="form.hjAddPrice=''"
-            placeholder="请填写银店加价"
-            maxlength="50"
-            type="digit"
-          />
-        </tui-list-cell>
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">金店加价</view> 
-          <input
-            v-model="form.zsAddPrice"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="zsAddPrice"
-            @focus="form.zsAddPrice=''"
-            placeholder="请填写金店加价"
-            maxlength="50"
-            type="digit"
-          />
-        </tui-list-cell>
-
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">单位比</view> 
-          <input
-            v-model="form.ratio"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="ratio"
-            placeholder="如：1扎=20支，请填写20"
-            maxlength="50"
-            type="number"
-          />
-        </tui-list-cell>
-
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">零售价系数</view> 
-          <input
-            v-model="form.smallRatio"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="smallRatio"
-            placeholder=""
-            maxlength="50"
-            type="number"
-          />
+          <input v-model="form.ratio" disabled="true" placeholder-class="phcolor" class="tui-input" name="ratio" placeholder="如：1扎=20支，请填写20" maxlength="50" type="number" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">每扎重量</view> 
-          <input
-            v-model="form.weight"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="weight"
-            placeholder="单位：公斤"
-            maxlength="50"
-            type="digit"
-          />
+          <input v-model="form.weight" disabled="true" placeholder-class="phcolor" class="tui-input" name="weight" placeholder="单位：公斤" maxlength="50" type="digit" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">库存预警值</view> 
-          <input
-            v-model="form.stockWarning"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="stockWarning"
-            placeholder="请填写"
-            maxlength="50"
-            type="number"
-          />
+          <input v-model="form.stockWarning" placeholder-class="phcolor" class="tui-input" name="stockWarning" placeholder="请填写" maxlength="50" type="number" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
@@ -286,18 +154,14 @@ export default {
         bigUnitId:1,
         smallUnitId:2,
         classId:'',
-        price:'',
         skAddPrice:'',
-        addPrice:'',
-        hjAddPrice:'',
-        zsAddPrice:'',
-        discountPrice:'',
         weight:'',
         cover:[],
         stockWarning:'',
         status:2,
         delStatus:0,
         itemId:0,
+        skPrice:0
       },
       itemClassSelectedData:{},
       itemClassData:[],
@@ -311,6 +175,15 @@ export default {
   },
 	computed:{
 		...mapGetters(["getLoginInfo","getDictionariesInfo"]),
+    smallPrice(){
+       let price = 0
+        if(this.form.skPrice){
+          let div = this.$util.div(this.form.skPrice,this.form.ratio)
+          price = this.$util.mul(div,this.form.smallRatio)
+          price = parseFloat(price.toFixed(2))
+        }
+        return price
+    }
 	},
   onLoad(option) {
     if(option.id){
@@ -391,12 +264,7 @@ export default {
         this.form.status = 1
         this.form.delStatus = 0
         this.form.id = 0
-        this.form.price = ''
         this.form.skAddPrice =''
-        this.form.addPrice =''
-        this.form.hjAddPrice =''
-        this.form.zsAddPrice =''
-        this.form.discountPrice = ''
       })
     },
     getDetail() {
@@ -407,21 +275,12 @@ export default {
         Object.keys(this.form).forEach((i, index) => {
           this.form[i] = res.data[i];
         });
-
         this.currentImgData.push(res.data.cover)
         this.form.cover = [res.data.shortCover]
 
-        this.form.price = res.data.prePrice
-
-        this.itemClassSelectedData = this.itemClassData.filter(
-          e => this.form.classId == e.id
-        )[0];
-        this.smallUnitSelectedData = this.unitData.filter(
-          e => this.form.smallUnitId == e.id
-        )[0];
-       this.bigUnitSelectedData = this.unitData.filter(
-          e => this.form.bigUnitId == e.id
-        )[0];
+        this.itemClassSelectedData = this.itemClassData.filter( e => this.form.classId == e.id )[0];
+        this.smallUnitSelectedData = this.unitData.filter( e => this.form.smallUnitId == e.id )[0];
+        this.bigUnitSelectedData = this.unitData.filter( e => this.form.bigUnitId == e.id )[0];
         this.productData = res.data
       });
     },
@@ -495,11 +354,7 @@ export default {
 					uni.showToast({title:"请填写库存，没有请填0",icon:"none"})
 					return;
 				}
-				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.discountPrice) == false){
-					uni.showToast({title:"请填写特价，没有特价请填0",icon:"none"})
-					return;
-				}
-				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.price) == false){
+				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.skPrice) == false){
 					uni.showToast({title:"请填写售价",icon:"none"})
 					return;
 				}
@@ -507,18 +362,6 @@ export default {
 					uni.showToast({title:"请填写散客加价",icon:"none"})
 					return;
 				}
-				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.addPrice) == false){
-					uni.showToast({title:"请填写普店加价",icon:"none"})
-					return;
-				}
-				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.hjAddPrice) == false){
-					uni.showToast({title:"请填写银店加价",icon:"none"})
-					return;
-				}
-				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.zsAddPrice) == false){
-					uni.showToast({title:"请填写金店加价",icon:"none"})
-					return;
-				}
       }
       let form = JSON.parse(JSON.stringify(this.form))
       uni.showLoading({mask:true})
@@ -574,38 +417,13 @@ export default {
         {
           name: "smallRatio",
           rule: ["required"],
-          msg: ["请填写零售价系数"]
-        },
-        {
-          name: "price",
-          rule: ["required"],
-          msg: ["请填写售价"]
+          msg: ["请填写单支价格倍数"]
         },
         {
           name: "skAddPrice",
           rule: ["required"],
           msg: ["请填写散客加价"]
         },
-        {
-          name: "addPrice",
-          rule: ["required"],
-          msg: ["请填写普店加价"]
-        },
-        {
-          name: "hjAddPrice",
-          rule: ["required"],
-          msg: ["请填写银店加价"]
-        },
-        {
-          name: "zsAddPrice",
-          rule: ["required"],
-          msg: ["请填写金店加价"]
-        },
-        {
-          name: "discountPrice",
-          rule: ["required"],
-          msg: ["不做特价请填0"]
-        },
         {
           name: "weight",
           rule: ["required"],

hdApp/src/api/product/index.js

@@ -29,11 +29,16 @@ export const autoPriceByIdApi = data => {
 	return https.post("/product/auto-price", data);
 };
 
-/**
- * 改价
- * productId
- * price
- */
+//添加花材
+export const addProduct = data => {
+	return https.post("/product/add", data);
+};
+
+//修改花材
+export const updateProduct = data => {
+	return https.post("/product/update", data);
+};
+
 export const changePriceByIdApi = data => {
 	return https.post("/product/change-price", data);
 };

hdApp/src/utils/util.js

@@ -414,69 +414,70 @@ export const noStockRemind = () =>{
 }
 
 //加
-export const add = (arg1, arg2) => {
-    var r1, r2, m, n;
+export const add = (a,b) => {
+    let c, d, e;
     try {
-        r1 = arg1.toString().split(".")[1].length
-    } catch (e) {
-        r1 = 0
+        c = a.toString().split(".")[1].length;
+    } catch (f) {
+        c = 0;
     }
     try {
-        r2 = arg2.toString().split(".")[1].length
-    } catch (e) { 
-        r2 = 0 
-    } 
-    m = Math.pow(10, Math.max(r1, r2))
-    n = (r1 >= r2) ? r1 : r2;
-    return ((arg1 * m + arg2 * m) / m).toFixed(n);
+        d = b.toString().split(".")[1].length;
+    } catch (f) {
+        d = 0;
+    }
+    e = Math.pow(10, Math.max(c, d));
+    return  (mul(a, e) + mul(b, e)) / e;
 }
 
 //减
-export const sub = (arg1, arg2) => {
-    var re1, re2, m, n;
+export const sub = (a, b) => {
+    let c, d, e;
     try {
-        re1 = arg1.toString().split(".")[1].length;
-    } catch (e) {
-    re1 = 0;
+        c = a.toString().split(".")[1].length;
+    } catch (f) {
+        c = 0;
     }
     try {
-        re2 = arg2.toString().split(".")[1].length;
-    } catch (e) {
-        re2 = 0;
+        d = b.toString().split(".")[1].length;
+    } catch (f) {
+        d = 0;
     }
-    m = Math.pow(10, Math.max(re1, re2)); 
-    n = (re1 >= re2) ? re1 : re2;
-    return ((arg1 * m - arg2 * m) / m).toFixed(n);
+    e = Math.pow(10, Math.max(c, d));
+    return (mul(a, e) - mul(b, e)) / e;
 }
 
 //乘
-export const mul = (arg1, arg2) => {
-    var m = 0;
-    var s1 = arg1.toString();
-    var s2 = arg2.toString();
+export const mul = (a,b) =>{
+    let c = 0,
+          d = a.toString(),
+          e = b.toString();
     try {
-        m += s1.split(".")[1].length;
-    } catch (e) {}
+        c += d.split(".")[1].length;
+    } catch (f) {}
     try {
-        m += s2.split(".")[1].length;
-    } catch (e) {}
- 
-    return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m);
+        c += e.split(".")[1].length;
+    } catch (f) {}
+    return Number(d.replace(".", "")) * Number(e.replace(".", "")) / Math.pow(10, c);  
 }
 
 // 除数，被除数， 保留的小数点后的位数
-export const div = (arg1,arg2,digit) =>{
-    var t1=0,t2=0,r1,r2;
-    try{t1=arg1.toString().split(".")[1].length}catch(e){}
-    try{t2=arg2.toString().split(".")[1].length}catch(e){}
-    r1=Number(arg1.toString().replace(".",""))
-    r2=Number(arg2.toString().replace(".",""))
-    //获取小数点后的计算值
-   var result= ((r1/r2)*Math.pow(10,t2-t1)).toString()
-    var result2=result.split(".")[1];
-    result2=result2.substring(0,digit>result2.length?result2.length:digit);
- 
-    return Number(result.split(".")[0]+"."+result2);
+export const div = (a, b) => {
+    var c, d, e = 0,
+           f = 0;
+    try {
+        e = a.toString().split(".")[1].length;
+    } catch (g) {
+        e = 0;
+    }
+    try {
+        f = b.toString().split(".")[1].length;
+    } catch (g) {
+        f = 0;
+    }
+    c = Number(a.toString().replace(".", ""));
+    d = Number(b.toString().replace(".", ""));
+    return mul(c / d, Math.pow(10, f - e));
 }
 
 export default {