Главная Обзор Помощь
Регистрация Вход
zhh
/
front-end
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

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

jiangfeng 5 лет назад
Родитель
40c6943168 1f51941f6b
Сommit
0e3419d9bb
17 измененных файлов с 60 добавлено и 16 удалено
Разделённый вид Показать статистику Diff
  1. 0 0
      ghs/dist/shop/css/chunk-3a53f8e7.a37b1fe3.css
  2. 2 2
      ghs/dist/shop/index.html
  3. 0 0
      ghs/dist/shop/js/app.d7ce8303.js
  4. 0 0
      ghs/dist/shop/js/chunk-08bd0f01.115d4d47.js
  5. 0 0
      ghs/dist/shop/js/chunk-3a53f8e7.48dd7a5c.js
  6. 0 1
      ghsApp/src/admin/home/apply.vue
  7. 5 0
      ghsApp/src/components/app-date-picker.vue
  8. 27 6
      ghsApp/src/pagesStore/me/cashSet.vue
  9. 0 0
      hd/dist/shop/css/chunk-20e58657.03f87db2.css
  10. 0 0
      hd/dist/shop/css/chunk-4de4d999.1a3b9046.css
  11. 2 2
      hd/dist/shop/index.html
  12. 0 0
      hd/dist/shop/js/app.1a886e42.js
  13. 0 0
      hd/dist/shop/js/chunk-160548f2.1ca36173.js
  14. 0 0
      hd/dist/shop/js/chunk-20e58657.ae329301.js
  15. 0 0
      hd/dist/shop/js/chunk-4de4d999.bd95902b.js
  16. 0 0
      hd/dist/shop/js/chunk-81c3c45a.92f00c76.js
  17. 24 5
      hdApp/src/pagesStore/me/cashSet.vue

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/css/chunk-3a53f8e7.a37b1fe3.css


+ 2 - 2
ghs/dist/shop/index.html
Просмотреть файл 

@@ -1,4 +1,4 @@
 
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><title>销花宝</title><link href="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><title>销花宝</title><link href="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 
 			body,
 
 			#app {
 
 				height: 100%;
 
@@ -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.2e475140.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.wixhb.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.wixhb.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.wixhb.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.wixhb.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.wixhb.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.wixhb.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.wixhb.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.wixhb.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.wixhb.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.2e475140.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.d7ce8303.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.d7ce8303.js"></script></body></html>

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/app.d7ce8303.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-08bd0f01.115d4d47.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-3a53f8e7.48dd7a5c.js


+ 0 - 1
ghsApp/src/admin/home/apply.vue
Просмотреть файл 

@@ -23,7 +23,6 @@
 
                 </div> 
             </view>
 
         </view>
 
-        <kd-entrance></kd-entrance>
 
     </view>
 
 </template>

+ 5 - 0
ghsApp/src/components/app-date-picker.vue
Просмотреть файл 

@@ -85,4 +85,9 @@ export default {
 
 </script>
 
 
 <style scoped>
 
+.uni-input{
 
+	width:420rpx;
 
+	height:50rpx;
 
+	padding-top:5rpx;
 
+}
 
 </style>

+ 27 - 6
ghsApp/src/pagesStore/me/cashSet.vue
Просмотреть файл 

@@ -3,31 +3,46 @@
 
     <div v-show="showStaffArea">
 
       <form @submit="formSubmit" @reset="formReset">
 
         <div class="module-com input-line-wrap">
 
+          
           <tui-list-cell class="line-cell" :hover="false">
 
-            <div class="tui-title required">支付宝姓名</div>
 
+            <div class="tui-title required">姓名</div>
 
             <input
 
               v-model="form.cashName"
 
               placeholder-class="phcolor"
 
               class="tui-input"
 
               name="cashName"
 
-              placeholder="请输入姓名"
 
+              placeholder="请输入姓名或公司名"
 
               maxlength="50"
 
               type="text"
 
             />
 
           </tui-list-cell>
 
 
           <tui-list-cell class="line-cell" :hover="false">
 
-            <div class="tui-title required">支付宝帐号</div>
 
+            <div class="tui-title required">银行卡号</div>
 
             <input
 
               v-model="form.cashAccount"
 
               placeholder-class="phcolor"
 
               class="tui-input"
 
               name="cashAccount"
 
-              placeholder="请输入帐号"
 
+              placeholder="请输入"
 
+              maxlength="50"
 
+              type="number"
 
+            />
 
+          </tui-list-cell>
 
+
 
+          <tui-list-cell class="line-cell" :hover="false">
 
+            <div class="tui-title required">开户行</div>
 
+            <input
 
+              v-model="form.cashBank"
 
+              placeholder-class="phcolor"
 
+              class="tui-input"
 
+              name="cashBank"
 
+              placeholder="如：建设银行厦门瑞景支行"
 
               maxlength="50"
 
               type="text"
 
             />
 
           </tui-list-cell>
 
+
 
         </div>
 
 
         <!-- 提交 -->
 
@@ -59,6 +74,7 @@ export default {
 
       form: {
 
         cashAccount: "",
 
         cashName: "",
 
+        cashBank:"",
 
       },
 
       roleList: [],
 
       roleSelData: {},
 
@@ -79,9 +95,9 @@ export default {
 
     async init() {
 
       try {
 
         const { data } = await currentShop();
 
-
 
         this.form.cashAccount = data.cashAccount;
 
         this.form.cashName = data.cashName;
 
+        this.form.cashBank = data.cashBank;
 
         this.$forceUpdate();
 
       } finally {
 
       }
 
@@ -105,7 +121,12 @@ export default {
 
         {
 
           name: "cashAccount",
 
           rule: ["required"],
 
-          msg: ["请输入帐号"],
 
+          msg: ["请输入卡号"],
 
+        },
 
+        {
 
+          name: "cashBank",
 
+          rule: ["required"],
 
+          msg: ["请输入开户行"],
 
         },
 
       ];
 
       // 进行表单检查

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hd/dist/shop/css/chunk-20e58657.03f87db2.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hd/dist/shop/css/chunk-4de4d999.1a3b9046.css


+ 2 - 2
hd/dist/shop/index.html
Просмотреть файл 

@@ -1,4 +1,4 @@
 
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><title>只管花</title><link href="https://img.huahb.cn/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.huahb.cn/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.huahb.cn/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.huahb.cn/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><title>只管花</title><link href="https://img.huaml.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.huaml.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.huaml.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.huaml.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 
 			body,
 
 			#app {
 
 				height: 100%;
 
@@ -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.128d0e80.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.huahb.cn/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.huahb.cn/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.huahb.cn/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.huahb.cn/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.huahb.cn/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.huahb.cn/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.huahb.cn/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.huahb.cn/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.huahb.cn/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.huahb.cn/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.huahb.cn/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.huahb.cn/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.128d0e80.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.1a886e42.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.huaml.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.huaml.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.huaml.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.huaml.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.huaml.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.huaml.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.huaml.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.huaml.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.huaml.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.huaml.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.huaml.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.huaml.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.1a886e42.js"></script></body></html>

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hd/dist/shop/js/app.1a886e42.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hd/dist/shop/js/chunk-160548f2.1ca36173.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hd/dist/shop/js/chunk-20e58657.ae329301.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hd/dist/shop/js/chunk-4de4d999.bd95902b.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hd/dist/shop/js/chunk-81c3c45a.92f00c76.js


+ 24 - 5
hdApp/src/pagesStore/me/cashSet.vue
Просмотреть файл 

@@ -4,26 +4,39 @@
 
       <form @submit="formSubmit" @reset="formReset">
 
         <div class="module-com input-line-wrap">
 
           <tui-list-cell class="line-cell" :hover="false">
 
-            <div class="tui-title required">支付宝姓名</div>
 
+            <div class="tui-title required">姓名</div>
 
             <input
 
               v-model="form.cashName"
 
               placeholder-class="phcolor"
 
               class="tui-input"
 
               name="cashName"
 
-              placeholder="请输入姓名"
 
+              placeholder="请输入姓名或公司名"
 
               maxlength="50"
 
               type="text"
 
             />
 
           </tui-list-cell>
 
 
           <tui-list-cell class="line-cell" :hover="false">
 
-            <div class="tui-title required">支付宝帐号</div>
 
+            <div class="tui-title required">银行卡号</div>
 
             <input
 
               v-model="form.cashAccount"
 
               placeholder-class="phcolor"
 
               class="tui-input"
 
               name="cashAccount"
 
-              placeholder="请输入帐号"
 
+              placeholder="请输入"
 
+              maxlength="50"
 
+              type="number"
 
+            />
 
+          </tui-list-cell>
 
+
 
+          <tui-list-cell class="line-cell" :hover="false">
 
+            <div class="tui-title required">开户行</div>
 
+            <input
 
+              v-model="form.cashBank"
 
+              placeholder-class="phcolor"
 
+              class="tui-input"
 
+              name="cashBank"
 
+              placeholder="如：建设银行厦门瑞景支行"
 
               maxlength="50"
 
               type="text"
 
             />
 
@@ -59,6 +72,7 @@ export default {
 
       form: {
 
         cashAccount: "",
 
         cashName: "",
 
+        cashBank:"",
 
       },
 
       roleList: [],
 
       roleSelData: {},
 
@@ -79,9 +93,9 @@ export default {
 
     async init() {
 
       try {
 
         const { data } = await currentShop();
 
-
 
         this.form.cashAccount = data.cashAccount;
 
         this.form.cashName = data.cashName;
 
+        this.form.cashBank = data.cashBank;
 
         this.$forceUpdate();
 
       } finally {
 
       }
 
@@ -107,6 +121,11 @@ export default {
 
           rule: ["required"],
 
           msg: ["请输入帐号"],
 
         },
 
+        {
 
+          name: "cashBank",
 
+          rule: ["required"],
 
+          msg: ["请输入开户行"],
 
+        },
 
       ];
 
       // 进行表单检查
 
       let formData = e.detail.value;

Некоторые файлы не были показаны из-за большого количества измененных файлов