shish 1 год назад
Родитель
Сommit
f139c25c54

+ 1 - 62
ghsApp/src/pagesClient/member/addCustomer.vue

@@ -6,7 +6,7 @@
     <form @submit="formSubmit">
       <view class="module-com">
         <tui-list-cell class="line-cell" :hover="false" >
-          <div class="tui-title">花店1</div>
+          <div class="tui-title">花店名称</div>
           <input v-model="form.name1" type="text" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="name1" placeholder="请输入名称" />
         </tui-list-cell>
         <tui-list-cell class="line-cell" :hover="false">
@@ -18,67 +18,6 @@
           <input v-model="form.confirmMobile1" type="number" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="confirmMobile1" placeholder="花店手机号" />
         </tui-list-cell>
       </view>
-
-      <view class="module-com">
-        <tui-list-cell class="line-cell" :hover="false" >
-          <div class="tui-title">花店2</div>
-          <input v-model="form.name2" type="text" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="name2" placeholder="请输入名称" />
-        </tui-list-cell>
-        <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title required">手机号</div>
-          <input v-model="form.mobile2" type="number" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="mobile2" placeholder="花店手机号" />
-        </tui-list-cell>
-        <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title required">确认手机号</div>
-          <input v-model="form.confirmMobile2" type="number" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="confirmMobile2" placeholder="花店手机号" />
-        </tui-list-cell>
-      </view>
-
-      <view class="module-com">
-        <tui-list-cell class="line-cell" :hover="false" >
-          <div class="tui-title">花店3</div>
-          <input v-model="form.name3" type="text" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="name3" placeholder="请输入名称" />
-        </tui-list-cell>
-        <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title required">手机号</div>
-          <input v-model="form.mobile3" type="number" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="mobile3" placeholder="花店手机号" />
-        </tui-list-cell>
-        <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title required">确认手机号</div>
-          <input v-model="form.confirmMobile3" type="number" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="confirmMobile3" placeholder="花店手机号" />
-        </tui-list-cell>
-      </view>
-
-      <view class="module-com">
-        <tui-list-cell class="line-cell" :hover="false" >
-          <div class="tui-title">花店4</div>
-          <input v-model="form.name4" type="text" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="name4" placeholder="请输入名称" />
-        </tui-list-cell>
-        <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title required">手机号</div>
-          <input v-model="form.mobile4" type="number" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="mobile4" placeholder="花店手机号" />
-        </tui-list-cell>
-        <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title required">确认手机号</div>
-          <input v-model="form.confirmMobile4" type="number" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="confirmMobile4" placeholder="花店手机号" />
-        </tui-list-cell>
-      </view>
-
-      <view class="module-com">
-        <tui-list-cell class="line-cell" :hover="false" >
-          <div class="tui-title">花店5</div>
-          <input v-model="form.name5" type="text" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="name5" placeholder="请输入名称" />
-        </tui-list-cell>
-        <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title required">手机号</div>
-          <input v-model="form.mobile5" type="number" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="mobile5" placeholder="花店手机号" />
-        </tui-list-cell>
-        <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title required">确认手机号</div>
-          <input v-model="form.confirmMobile5" type="number" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="confirmMobile5" placeholder="花店手机号" />
-        </tui-list-cell>
-      </view>
-
       <view class="app-footer">
         <!-- <view class="admin-button-com middle blue" style="margin-right:60upx;font-size:30upx;height:70upx;line-height:70upx;width:160upx;" @click="pageTo({url:'/admin/work/add'})">新增</view> -->
         <div class="btn-wrap">

+ 11 - 17
hdApp/src/admin/billing/affirm.vue

@@ -28,7 +28,7 @@
 							</view>
 						</view>
 						<view class="summary-bar">
-							<view class="operate-view" @click="gobackEvent">
+							<view class="operate-view" @click="backModify">
 								<text class="iconfont icongouwuche"></text>返回修改
 							</view>
 							<view class="describe-view">
@@ -86,7 +86,6 @@
 								</view>
 							</picker>
 						</view>
-						<!--<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" >
@@ -105,8 +104,6 @@
 			</view>
 			<button class="admin-button-com blue big" @click="affirmFormSubmit">开单</button>
 		</view>
-		<!-- 选择客户 -->
-		<AppCustomerSel :show.sync="showCustomer" @change="changeCustomerFn" />
 	</view>
 </template>
 
@@ -115,7 +112,6 @@ import TuiListCell from "@/components/plugin/list-cell";
 import AppAvatarModule from "@/components/module/app-avatar";
 import SimpleAddress from "@/components/plugin/simple-address";
 import AppAreaSel from "@/components/app-area-sel";
-import AppCustomerSel from "@/components/app-customer-sel";
 import productMins from "@/mixins/product";
 import appFormRadioBtn from "@/components/app-formRadio-btn";
 import appAddressGroup from "@/components/app-address-group";
@@ -130,7 +126,6 @@ export default {
 		AppAvatarModule,
 		SimpleAddress,
 		AppAreaSel,
-		AppCustomerSel,
 		appFormRadioBtn,
 		appAddressGroup,
 		appSendTime
@@ -139,11 +134,11 @@ export default {
 	data() {
 		return {
 			autoLoad: false,
-			packingMoney:'',//包装费
-			freight:'',//运费
-			modifyPrice:0,//真实金额
-			payWay:0,//支付类型
-			clientInfo: '',//客户信息
+			packingMoney:'',
+			freight:'',
+			modifyPrice:0,
+			payWay:0,
+			clientInfo: '',
 			showCustomer: false,
 			sendType:1,
 			discountIndex:0,
@@ -260,12 +255,11 @@ export default {
 				})
 			})
 		},
-		gobackEvent() {
-			if(this.option.customId){
-				this.$util.pageTo({url: '/admin/billing/index',type:2,query: {customId: this.option.customId}})
-			}else{
-				this.$util.pageTo({url: '/admin/billing/index',type:2})
-			}
+		backModify() {
+			let customId = this.option.customId ? this.option.customId:0
+			let customName = this.option.customName?this.option.customName:''
+			let orderId = this.option.orderId ? this.option.orderId : 0
+			this.$util.pageTo({url: '/admin/billing/index?customId='+customId+'&customName='+customName+'&orderId='+orderId,type:2})
 		}
 	}
 };

+ 1 - 1
hdApp/src/admin/billing/index.vue

@@ -188,7 +188,7 @@ export default {
 			let customName = this.option.customName ? this.option.customName : '';
 			let orderId = this.option.orderId  ? this.option.orderId : 0
 			let customId = this.option.customId ? this.option.customId : 0
-			this.$util.pageTo({ url: '/admin/billing/affirm',type:2,query: {customId:customId,customName:customName,orderId:orderId}})
+			this.$util.pageTo({ url: '/admin/billing/affirm?customId='+customId+'&customName='+customName+'&orderId='+orderId,type:2})
 		}
 	}
 };

+ 1 - 63
hdApp/src/admin/custom/addCustom.vue

@@ -3,7 +3,7 @@
     <form @submit="formSubmit">
       <view class="module-com">
         <tui-list-cell class="line-cell" :hover="false" >
-          <div class="tui-title">客户1</div>
+          <div class="tui-title">客户名称</div>
           <input v-model="form.name1" type="text" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="name1" placeholder="请输入名称" />
         </tui-list-cell>
         <tui-list-cell class="line-cell" :hover="false">
@@ -15,67 +15,6 @@
           <input v-model="form.confirmMobile1" type="number" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="confirmMobile1" placeholder="客户手机号" />
         </tui-list-cell>
       </view>
-
-      <view class="module-com">
-        <tui-list-cell class="line-cell" :hover="false" >
-          <div class="tui-title">客户2</div>
-          <input v-model="form.name2" type="text" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="name2" placeholder="请输入名称" />
-        </tui-list-cell>
-        <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title required">手机号</div>
-          <input v-model="form.mobile2" type="number" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="mobile2" placeholder="客户手机号" />
-        </tui-list-cell>
-        <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title required">确认手机号</div>
-          <input v-model="form.confirmMobile2" type="number" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="confirmMobile2" placeholder="客户手机号" />
-        </tui-list-cell>
-      </view>
-
-      <view class="module-com">
-        <tui-list-cell class="line-cell" :hover="false" >
-          <div class="tui-title">客户3</div>
-          <input v-model="form.name3" type="text" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="name3" placeholder="请输入名称" />
-        </tui-list-cell>
-        <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title required">手机号</div>
-          <input v-model="form.mobile3" type="number" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="mobile3" placeholder="客户手机号" />
-        </tui-list-cell>
-        <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title required">确认手机号</div>
-          <input v-model="form.confirmMobile3" type="number" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="confirmMobile3" placeholder="客户手机号" />
-        </tui-list-cell>
-      </view>
-
-      <view class="module-com">
-        <tui-list-cell class="line-cell" :hover="false" >
-          <div class="tui-title">客户4</div>
-          <input v-model="form.name4" type="text" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="name4" placeholder="请输入名称" />
-        </tui-list-cell>
-        <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title required">手机号</div>
-          <input v-model="form.mobile4" type="number" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="mobile4" placeholder="客户手机号" />
-        </tui-list-cell>
-        <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title required">确认手机号</div>
-          <input v-model="form.confirmMobile4" type="number" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="confirmMobile4" placeholder="客户手机号" />
-        </tui-list-cell>
-      </view>
-
-      <view class="module-com">
-        <tui-list-cell class="line-cell" :hover="false" >
-          <div class="tui-title">客户5</div>
-          <input v-model="form.name5" type="text" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="name5" placeholder="请输入名称" />
-        </tui-list-cell>
-        <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title required">手机号</div>
-          <input v-model="form.mobile5" type="number" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="mobile5" placeholder="客户手机号" />
-        </tui-list-cell>
-        <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title required">确认手机号</div>
-          <input v-model="form.confirmMobile5" type="number" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="confirmMobile5" placeholder="客户手机号" />
-        </tui-list-cell>
-      </view>
-
       <view class="app-footer">
         <div class="btn-wrap">
           <button class="admin-button-com blue big" formType="submit">确认</button>
@@ -84,7 +23,6 @@
     </form>
   </div>
 </template>
-
 <script>
 import TuiListCell from "@/components/plugin/list-cell";
 const form = require("@/utils/formValidation.js");

+ 336 - 0
hdApp/src/admin/custom/selectCustom.vue

@@ -0,0 +1,336 @@
+<template>
+    <div class="app-main app-content">
+      <view class="input-wrap_box">
+        <view>
+          <AppSearchModule placeholder="输入拼音首字母搜索" @input="searchFn"/>
+        </view>
+      </view>
+      <block v-if="!$util.isEmpty(list.data)">
+        <block v-for="(item, index) in list.data" :key="index">
+          <tui-list-cell :arrow="true" @click="selectCurrent(item)">
+            <div class="tui-msg-box">
+              <img :src="item.avatar" class="tui-msg-pic" mode="widthFix"/>
+              <div class="tui-msg-item" style="position:relative;">
+                <div class="tui-msg-name">
+                  <div class="tui-user-name">
+                    {{ item.name }}
+                    <text v-if="item.level == 2" class="super-man">大客</text>
+                    <text v-if="item.level == 0" class="ls-man">散客</text>
+                  </div>
+                </div>
+                <div class="tui-msg-content">
+                  <span>{{ item.visitTime.substr(5,11) }}</span>
+  
+                  <span v-if="Number(item.remainDebtAmount) > 0" class="debt-amount">
+                    欠款<span class="amount_num">{{item.remainDebtAmount}}</span>
+                  </span>
+  
+                  <span v-if="Number(item.remainDebtAmount) < 0" class="debt-amount">
+                    余额<span class="amount_num" style="color:#3385FF;">{{Math.abs(item.remainDebtAmount)}}</span>
+                  </span>
+  
+                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 10000" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">没有下过单</text>
+                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 7" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1周未下单</text>
+                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 30" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1个月未下单</text>
+                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 180" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超半年未下单</text>
+                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 365" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1年未下单</text>
+  
+                </div>
+  <image :src="`${constant.imgUrl}/icon/scan/scan.png`" mode="widthFix" @click.stop="selectCurrent(item,1)" v-if="getMyShopInfo && getMyShopInfo.scan == 1"
+  style="position:absolute;right:0upx;top:20upx;width:60upx;"></image>
+              </div>
+            </div>
+            <div class="tui-msg-right">
+              <badge-module type="danger" :dot="item.level == 3 ? true : false" v-if="item.messageNum > 0" >{{ item.messageNum }}</badge-module >
+            </div>
+          </tui-list-cell>
+        </block>
+      </block>
+      <block v-else>
+        <app-wrapper-empty :is-empty="$util.isEmpty(list.data)" />
+      </block>
+    </div>
+  </template>
+  <script>
+  import TuiListCell from "@/components/plugin/list-cell";
+  import BadgeModule from "@/components/plugin/badge";
+  import AppWrapperEmpty from "@/components/app-wrapper-empty";
+  import appVipModule from "@/components/module/app-vip";
+  import AppTag from "@/components/module/app-tag.vue";
+  import AppSearchModule from "@/components/module/app-search";
+  import { list } from "@/mixins";
+  import { getList } from "@/api/member";
+  import { mapGetters } from "vuex";
+  export default {
+    name: "selectCustom",
+    components: {
+      TuiListCell,
+      BadgeModule,
+      AppWrapperEmpty,
+      appVipModule,
+      AppTag,
+      AppSearchModule,
+      couldScan:false
+    },
+    mixins: [list],
+    data() {
+      return {
+        tabIndex: 0,
+        selectStyle:1
+      };
+    },
+    computed:{
+      ...mapGetters(["getMyShopInfo"]),
+    },
+    onPullDownRefresh() {
+      this.resetList();
+      this._list().then((res) => {
+        uni.stopPullDownRefresh();
+      });
+    },
+    onReachBottom() {
+      if (!this.list.finished) {
+        this._list().then((res) => {
+          uni.stopPullDownRefresh();
+        });
+      } else {
+        uni.stopPullDownRefresh();
+      }
+    },
+    onLoad(option) {
+      // #ifdef APP-PLUS
+      if(plus.device.vendor == 'Newland'){
+        this.couldScan = true
+      }
+      // #endif
+    },
+      onShow(){
+          uni.removeStorageSync('newClient');
+      },
+    methods: {
+      selectCurrent(item,scanEnv=0){
+        let style = this.option.style ? this.option.style : 1
+        this.selectStyle = style
+        if(style == 1){
+          //选择客户并开单情况
+            this.$util.pageTo({url: '/admin/billing/index?customId='+item.id+'&customName='+item.name,type:2})
+        }else if(style == 2){
+          //用于选择客户并且需要返回的情况
+          let pages = getCurrentPages();
+          let prevPage = pages[ pages.length - 2 ];
+          prevPage.$vm.form.customId = item.id;
+          prevPage.$vm.form.customName = item.name;
+          uni.navigateBack({})
+        }
+      },
+      init() {
+        if(!this.no_shop_show_model) {
+          this._list();
+        }
+      },
+      searchFn(e) {
+          this.resetList();
+          this.seekVal = e;
+          this._list();
+      },
+      _list() {
+        return getList({
+            search: "",
+            type:this.tabIndex,
+            page: this.list.page,
+            name: this.seekVal,
+          }).then((res) => {
+            this.completes(res);
+            if (this.$util.isEmpty(res.data)){
+              return false;
+            }
+          });
+      },
+      change(e) {
+        if (this.tabIndex == e.index) {
+          return false;
+        }
+        this.tabIndex = e.index;
+        this.resetList();
+        this._list();
+      },
+    },
+  };
+  </script>
+  
+  <style lang="scss" scoped>
+  .app-content {
+    padding-top: 100upx;
+    padding-bottom: 20upx;
+  }
+  .tabs-wrap {
+    position: fixed;
+    .tabs-left {
+      width: 80%;
+    }
+    .tabs-right {
+      width: 19%;
+      border-left: $borderColor;
+      @include disFlex(center, center);
+    }
+  }
+  .input-wrap_box {
+    background-color: #fff;
+    position: fixed;
+    top: 0;
+    z-index: 10;
+    /* 手机mobile屏幕小于1000px */
+    @media screen and (max-width: 1100px) {
+      width: 100%;
+    }
+    /* 收银台cashier屏幕大于1000px */
+    @media screen and (min-width:1100px) {
+      width: 40%;
+    }
+    height: 100upx;
+    display: flex;
+    align-items: center;
+    padding: 0 30upx;
+    & > view:nth-child(1) {
+      flex: 1;
+    }
+  }
+  .tui-msg-box {
+    display: flex;
+    align-items: center;
+  
+    .tui-msg-pic {
+      width: 80upx;
+      height: 80upx;
+      border-radius: 50%;
+      margin-right: 20upx;
+    }
+  
+    .tui-msg-item {
+      max-width: 500upx;
+      min-height: 80upx;
+      overflow: hidden;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      & > div {
+        @include disFlex(center, flex-start);
+        & > div:first-child {
+          margin-right: 8upx;
+        }
+      }
+      .level-img {
+        ::v-deep.vip-text {
+          left: 70upx;
+          top: 8upx;
+        }
+      }
+      .normal-img {
+        width: 70upx;
+        padding: 2upx 6upx;
+        color: #999;
+        background-color: #f0f2f6;
+        border-radius: 20upx;
+        .vip-text {
+          font-size: 24upx;
+          transform: scale(0.6);
+          position: relative;
+          top: -2upx;
+          left: -8upx;
+        }
+      }
+      .member-img {
+        width: 70upx;
+        padding: 2upx 6upx;
+        color: green;
+        background-color: #f0f2f6;
+        border-radius: 20upx;
+        .vip-text {
+          font-size: 24upx;
+          transform: scale(0.6);
+          position: relative;
+          top: -2upx;
+          left: -8upx;
+        }
+      }
+      .iconfont {
+        color: #00aaed;
+      }
+    }
+  
+    .tui-msg-name {
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      font-size: 30upx;
+      line-height: 1;
+      color: #262b3a;
+      .tui-user-name {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        width: 500upx;
+        font-size: 32upx;
+        .super-man{
+          margin-left:30upx;
+          color:red;
+          font-size:24upx;
+          display:inline-block;
+          color:white;
+          border:1upx solid green;
+          padding:6upx 10upx;
+          background-color: green;
+          border-radius: 11upx;
+        }
+        .ls-man{
+          margin-left:30upx;
+          font-size:24upx;
+          display:inline-block;
+          color:white;
+          border:1upx solid #a5b1a5;
+          padding:6upx 10upx;
+          background-color: #a5b1a5;
+          border-radius: 11upx;
+        }
+      }
+    }
+  
+    .tui-msg-content {
+      width:500upx;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      font-size: 24upx;
+      line-height: 1;
+      color: #9397a4;
+      .debt-amount{
+        margin-left:20upx;
+        .amount_num{
+          color:red;
+          margin-left:6upx;
+          font-weight:bold;
+        }
+      }
+    }
+  }
+  .tui-msg-right {
+    max-width: 120upx;
+    height: 80upx;
+    margin-left: auto;
+    margin-right: 24upx;
+    text-align: right;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+  .user_tag {
+    border: 1upx solid #cccccc;
+    padding: 5upx 12upx 5upx 12upx;
+    border-radius: 25upx;
+    color: #bbbbbb;
+    margin-right: 10upx;
+    margin-bottom: 12upx;
+    display: inline-block;
+    font-size: 30upx;
+  }
+  </style>

+ 5 - 2
hdApp/src/admin/home/workbench.vue

@@ -94,7 +94,7 @@
 
   <view class="module-com">
     <view class="tabs-head_bx">
-      <image @click="goShKd()" :src="lskd1" mode="widthFix"></image>
+      <image @click="goKjKd()" :src="lskd1" mode="widthFix"></image>
       <image @click="goShKd()" :src="lskd2" mode="widthFix"></image>
     </view>
     <div class="tabs-wrap">
@@ -586,8 +586,11 @@ export default {
       //选择花材生成制作单和订单
       this.$util.pageTo({url:'/admin/order/workOrder'})
     },
+    goKjKd(){
+      this.$util.pageTo({url:'/admin/billing/index?customId=0&customName=""'})
+    },
     goShKd(){
-      this.$util.pageTo({url:'/admin/billing/index'})
+      this.$util.pageTo({url:'/admin/custom/selectCustom'})
     },
     goPage (item) {
       if (item.url === '/admin/billing/priceChange') {

+ 1 - 0
hdApp/src/pages.json

@@ -44,6 +44,7 @@
 			"root": "admin/custom",
 			"pages": [
 				{"path": "addCustom","style": {"navigationBarTitleText": "添加客户"}},
+				{"path": "selectCustom","style": {"navigationBarTitleText": "选择客户"}},
 				{"path": "balanceChange","style": {"navigationBarTitleText": "余额变动明细"}},
 				{"path": "rechargeChange","style": {"navigationBarTitleText": "充值记录"}},
 				{"path": "levelChange","style": {"navigationBarTitleText": "等级变动记录"}}