Procházet zdrojové kódy

Merge branch 'master' of http://git.huaml.com/zhh/front-end

jf před 5 roky
rodič
revize
4f3cad794a

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
ghs/dist/shop/css/chunk-64ccf06c.22bf6216.css


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
ghs/dist/shop/css/chunk-a4c5273e.f48adcbb.css


+ 1 - 1
ghs/dist/shop/index.html

@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				font-size: 12px;
-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.0309308c.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.0309308c.js"></script></body></html>
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.10ae2ba6.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.10ae2ba6.js"></script></body></html>

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
ghs/dist/shop/js/app.10ae2ba6.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
ghs/dist/shop/js/chunk-2f9d4485.40c795fd.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
ghs/dist/shop/js/chunk-64ccf06c.9be198b8.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
ghs/dist/shop/js/chunk-7872ae4c.ec40a290.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
ghs/dist/shop/js/chunk-a4c5273e.9d4300df.js


+ 10 - 10
ghs/src/views/order/add.vue

@@ -216,11 +216,11 @@
         </div>
         <div class="accounts-list">
           实收
-          <el-input style="width: 80%" v-model="realMoney" clearable></el-input>
+          <el-input style="width: 80%" v-model="modifyPrice" clearable></el-input>
         </div>
         <div class="accounts-list">
           优惠
-          <div class="accounts-center">{{(totalMoney - realMoney).toFixed(2)}}</div>
+          <div class="accounts-center">{{(totalMoney - modifyPrice).toFixed(2)}}</div>
         </div>
         <div class="accounts-list">
           备注
@@ -235,7 +235,7 @@
         <div class="accounts-list">
           {{ payType }}
           <div class="accounts-center">
-            ¥{{ realMoney }}
+            ¥{{ modifyPrice }}
           </div>
         </div>
         <div class="accounts-list">
@@ -318,7 +318,7 @@ export default {
       big:null,//大单位(扎)
       small:null,//小单位(支)
       totalMoney:0,//总价
-      realMoney:0,//实际收款
+      modifyPrice:0,//实际收款
       allList:'',//所有-可搜索数据
       seekVal:'',//搜索值
       seekOldVal:'',//旧-搜索值(上一次搜索值)
@@ -422,9 +422,9 @@ export default {
     }
   },
   methods: {
-    realMoneyFun(money){
-      let realMoney =  this.$util.copyObject(money)
-      return realMoney.toFixed(2);
+    modifyPriceFun(money){
+      let modifyPrice =  this.$util.copyObject(money)
+      return modifyPrice.toFixed(2);
     },
     todays(type) {
       var myDate = new Date();
@@ -465,7 +465,7 @@ export default {
         product:JSON.stringify(product),
         remark:this.remark,
         clearType:this.payType=='欠款'?1:2,
-        realPrice: this.realMoney,
+        modifyPrice: this.modifyPrice,
       }
       this.$service.order.orderCreate(parameter).then(res => {
         this.orderMsg = res;
@@ -590,7 +590,7 @@ export default {
       })
       this.totalMoney = totalMoney;
       this.number = this.totalMoney
-      this.realMoney = this.totalMoney;
+      this.modifyPrice = this.totalMoney;
     },
     /**关闭选择扎支弹窗-初始化**/
     escFun(){
@@ -714,7 +714,7 @@ export default {
     },
     freightInput(){
        this.totalMoney = Number(this.freight) +  this.number
-       this.realMoney = Number(this.freight) +  this.number
+       this.modifyPrice = Number(this.freight) +  this.number
     }
   }
 };

+ 16 - 15
ghsApp/src/pagesInvite/inviteGhsShop.vue

@@ -65,23 +65,24 @@ export default {
       }).catch(err => {})
     },
     goToMallPt () {
+      this.pageTo({url: `/pagesClient/official/index?ghsShopAdminId=${this.loginInfo.shopAdminId}`})
       //查看分享的路径,不要删除 shish 20210517
-			console.log('pagesClient/official/index?hdShopAdminId='+this.loginInfo.shopAdminId)
+			// console.log('pagesClient/official/index?hdShopAdminId='+this.loginInfo.shopAdminId)
 
-			getWeixinId().then(res => {
-				uni.navigateToMiniProgram({
-					appId: res.data.ghs.miniAppId,
-					path: 'pagesClient/official/index?hdShopAdminId='+this.loginInfo.shopAdminId,
-					//develop 开发版 trial 体验版 release 正式版
-					envVersion: process.env.NODE_ENV === 'development' ? 'develop' : 'release',
-					extraData: {
-						//'hdShopAdminId': this.loginInfo.shopAdminId
-					},
-					success(res) {
-						// 打开成功
-					}
-				})
-			})
+			// getWeixinId().then(res => {
+			// 	uni.navigateToMiniProgram({
+			// 		appId: res.data.ghs.miniAppId,
+			// 		path: 'pagesClient/official/index?hdShopAdminId='+this.loginInfo.shopAdminId,
+			// 		//develop 开发版 trial 体验版 release 正式版
+			// 		envVersion: process.env.NODE_ENV === 'development' ? 'develop' : 'release',
+			// 		extraData: {
+			// 			//'hdShopAdminId': this.loginInfo.shopAdminId
+			// 		},
+			// 		success(res) {
+			// 			// 打开成功
+			// 		}
+			// 	})
+			// })
     },
   }
 }

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

@@ -68,8 +68,8 @@
 				<view class="select-view">
 					<view class="select-cmd_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"
 																							@deleteInputVal="deleteAloneInputVal" @initAllInput="initAloneAllInput" @moveAllInput="moveAloneAllInput">
 							</allSelectInput> <text style="margin-left: 20rpx">元</text>

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

@@ -116,11 +116,11 @@
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
 						<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 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 class="line-cell remark-wrap" :hover="false">

+ 9 - 9
hdApp/src/admin/billing/affirm.vue

@@ -86,7 +86,7 @@
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 						<view class="tui-title">实收金额</view>
 						<view class="flex-space" style="width: 100%;">
-							<input style="border: 1px solid #eee;color: #3385FF;width: 60%;height:70rpx;" type="number" @focus="realMoney='',discountIndex=0" v-model="realMoney" placeholder-class="tui-placeholder"/>
+							<input style="border: 1px solid #eee;color: #3385FF;width: 60%;height:70rpx;" type="number" @focus="modifyPrice='',discountIndex=0" v-model="modifyPrice" placeholder-class="tui-placeholder"/>
 							<picker style="border: 1px solid #eee;width: 30%;" @change="discountChange" :value="discountIndex" :range="discount">
 								<view class="flex-space" style="height:70rpx;">
 									<view class="uni-input">{{discount[discountIndex]}}</view>
@@ -94,12 +94,12 @@
 								</view>
 							</picker>
 						</view>
-						<!--<input style="border: 1px solid #eee;color: #3385FF;width: calc(100%);" type="number" @focus="realMoney=''" v-model="realMoney" placeholder-class="tui-placeholder"/>-->
+						<!--<input style="border: 1px solid #eee;color: #3385FF;width: calc(100%);" type="number" @focus="modifyPrice=''" v-model="modifyPrice" placeholder-class="tui-placeholder"/>-->
 					</tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 						<view class="tui-title">优惠</view>
-						<text style="color: #3385FF">{{	((allPrice+Number(packingMoney)+Number(freight)).toFixed(2) - realMoney).toFixed(2) }}</text>
+						<text style="color: #3385FF">{{	((allPrice+Number(packingMoney)+Number(freight)).toFixed(2) - modifyPrice).toFixed(2) }}</text>
 					</tui-list-cell>
 
 
@@ -112,7 +112,7 @@
 				<text class="price-title">收款</text>
 				<text class="price-number">
 					<!--¥ <text class="large">{{	(allPrice+Number(packingMoney)+Number(freight)).toFixed(2)  }}</text>-->
-					¥ <text class="large">{{	realMoney }}</text>
+					¥ <text class="large">{{ modifyPrice }}</text>
 				</text>
 			</view>
 			<button class="admin-button-com blue middle" @click="affirmFormSubmit">开单</button>
@@ -157,7 +157,7 @@ export default {
 			autoLoad: false,
 			packingMoney:'',//包装费
 			freight:'',//运费
-			realMoney:0,//真实金额
+			modifyPrice:0,//真实金额
 			payType:0,//支付类型
 			clientInfo: '',//客户信息
 			showCustomer: false,
@@ -178,7 +178,7 @@ export default {
 				title: this.getMerchantInfo.name
 			});
 		}
-		this.realMoney = this.allPrice.toFixed(2);
+		this.modifyPrice = this.allPrice.toFixed(2);
 	},
 	computed: {
 		...mapGetters(["getMerchantInfo", "getLoginInfo","getDictionariesInfo"])
@@ -219,11 +219,11 @@ export default {
 					discount = (allPrices - (allPrices * 0.6)).toFixed(2);
 					break;
 			}
-			this.realMoney = (allPrices - discount).toFixed(2);
+			this.modifyPrice = (allPrices - discount).toFixed(2);
 		},
 		countAllPrices(){
 			let allPrices = this.allPrice.toFixed(2)
-			this.realMoney = (Number(allPrices) + Number(this.freight) + Number(this.packingMoney)).toFixed(2);
+			this.modifyPrice = (Number(allPrices) + Number(this.freight) + Number(this.packingMoney)).toFixed(2);
 		},
 		// 选取客户
 		changeCustomerFn(info) {
@@ -245,7 +245,7 @@ export default {
 				customId:this.clientInfo.id,// 客户
 				payWay:this.payType,//付款方式
 				sendType:this.sendType,
-				realPrice: this.realMoney,
+				modifyPrice: this.modifyPrice,
 				product:JSON.stringify(product),//下单商品
 			};
 			let self = this;

+ 1 - 1
hdApp/src/admin/order/detail.vue

@@ -107,7 +107,7 @@
       <!-- 优惠信息 -->
       <div
         class="module-com coupon-wrap"
-        v-if="data.discountAmount && data.discountAmount != '0.00'"
+        v-if="data.discountAmount && data.discountAmount != '0.00' && 1==2"
       >
         <div class="module-det flex-center-between">
           <div

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

@@ -2,13 +2,13 @@
   <div class="app-content">
     <div class="recharge_box">
       <view class="renew">
-        续费<text style="padding-left: 10upx;">{{initData.renew}}</text>/年<text
+        续期<text>{{initData.renew}}</text>元<text
           class="toBuy"
           @click="goBuy"
-        >去购买</text>
+        >选择</text>
       </view>
       <view class="voucher">
-        充值<text style="color: #FF3C00;padding-left: 10upx;">{{initData.recharge}}元</text>,免费使用一年
+        充值<text style="color: #FF3C00">{{initData.recharge}}</text>元花款,免费续期一年
       </view>
       <view>
         <picker @change="startTimeFn" class="tui-input" :range="ghsList" range-key="name" :value="selectIndex">
@@ -75,7 +75,7 @@ export default {
     // 立即充值
     onceRecharge () {
       if(!this.ghsId) {
-        this.$msg('请先选择供货商')
+        this.$msg('请选择供应商')
         return
       }
       rechargeRenewPay({ghsId: this.ghsId}).then(res => {

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

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

+ 16 - 15
hdApp/src/pagesInvite/inviteHdShop.vue

@@ -65,23 +65,24 @@ export default {
       }).catch(err => {})
     },
     goToMallPt () {
+      this.pageTo({url: `/pagesClient/official/index?hdShopAdminId=${this.loginInfo.shopAdminId}`})
       //查看分享的路径,不要删除 shish 20210517
-			console.log('pagesClient/official/index','ghsShopAdminId='+ this.loginInfo.shopAdminId)
+			// console.log('pagesClient/official/index','ghsShopAdminId='+ this.loginInfo.shopAdminId)
 
-			getWeixinId().then(res => {
-				uni.navigateToMiniProgram({
-					appId: res.data.hd.miniAppId,
-					path: 'pagesClient/official/index?ghsShopAdminId='+this.loginInfo.shopAdminId,
-					//develop 开发板 trial 体验版 release 正式版
-					envVersion: process.env.NODE_ENV === 'development' ? 'develop' : 'release',
-					extraData: {
-						//'ghsShopAdminId': this.loginInfo.shopAdminId
-					},
-					success(res) {
-						// 打开成功
-					}
-				})
-			});
+			// getWeixinId().then(res => {
+			// 	uni.navigateToMiniProgram({
+			// 		appId: res.data.hd.miniAppId,
+			// 		path: 'pagesClient/official/index?ghsShopAdminId='+this.loginInfo.shopAdminId,
+			// 		//develop 开发板 trial 体验版 release 正式版
+			// 		envVersion: process.env.NODE_ENV === 'development' ? 'develop' : 'release',
+			// 		extraData: {
+			// 			//'ghsShopAdminId': this.loginInfo.shopAdminId
+			// 		},
+			// 		success(res) {
+			// 			// 打开成功
+			// 		}
+			// 	})
+			// });
     },
   }
 }

+ 1 - 1
hdApp/src/pagesInvite/list.vue

@@ -124,7 +124,7 @@ export default {
 	methods: {
 		inviteGhs(){
       this.pageTo({
-        url: '/pagesInvite/inviteGhsShop'
+        url: '/pagesInvite/inviteShop'
       })
         //查看分享的路径,不要删除 shish 20210517
 			// console.log('pagesClient/official/index?hdShopAdminId='+this.loginInfo.shopAdminId)

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

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

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

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

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů