shish 1 жил өмнө
parent
commit
b7053657fb

+ 10 - 2
hdApp/src/admin/home/login.vue

@@ -63,7 +63,7 @@
 				<!-- #endif -->
 				<view style="margin-top:45upx;color:#333333;font-size:38upx;width:100%;text-align:right;padding-right:70upx;">
 					<text style="margin-right:40upx;" @click="useAccount()">使用账号密码登录</text>
-					<text @click="register">注册号</text>
+					<text @click="register">注册号</text>
 				</view>
 			</view>
 			</view>
@@ -135,7 +135,9 @@ export default {
 		register(){
 			let itemId = this.option.itemId ? this.option.itemId : 0
 			let ghsShopId = this.option.ghsShopId ? this.option.ghsShopId : 0
-			this.pageTo({url:'/pagesClient/official/apply?itemId='+itemId+'&ghsShopId='+ghsShopId,type:2})
+			// 2 失信人员列表
+			let fromType = this.option.fromType?this.option.fromType:0
+			this.pageTo({url:'/pagesClient/official/apply?itemId='+itemId+'&ghsShopId='+ghsShopId+'&fromType='+fromType,type:2})
 		},
 		goBack(){
 			uni.navigateBack({})
@@ -226,6 +228,12 @@ export default {
 						getShopInfo(true).then(res => { uni.setNavigationBarTitle({ title: res.name }) })
 						that.setUserShopAll()
 
+						if(this.option.fromType && this.option.fromType == 2){
+							//跳转失信人员页面
+							that.$util.pageTo({url: "/admin/ll/list", type:2})
+							return false
+						}
+
 						if(this.option.itemId && Number(this.option.itemId)>0 && this.option.ghsShopId && Number(this.option.ghsShopId)>0){
 							ghsInfo({shopId:this.option.ghsShopId}).then(resInfo => {
 								let ghsId = resInfo.data.id

+ 8 - 0
hdApp/src/admin/ll/list.vue

@@ -86,6 +86,14 @@
         this.loginStyle  = 1
       }
     },
+    onShareAppMessage(res) {
+      return {
+        title: '失信人员查询登记',
+        desc: '',
+        imageUrl:this.constant.imgUrl + "/logo4.png",
+        path: 'admin/ll/list'
+      }
+    },
     watch: {
       loginInfo(newVal) {
         if(!this.$util.isEmpty(newVal.admin) && newVal.admin.currentShopId > 0){

+ 1 - 1
hdApp/src/admin/setting/password.vue

@@ -17,7 +17,7 @@
     <form @submit="formSubmit">
       <div class="input-line-wrap">
         <tui-list-cell class="line-cell">
-          <div class="tui-title">号</div>
+          <div class="tui-title">号</div>
           <div class="tui-title">{{selfInfo.id}}</div>
         </tui-list-cell>
         <tui-list-cell class="line-cell" :hover="false" v-if="isOldPass">

+ 1 - 1
hdApp/src/api/official/index.js

@@ -35,7 +35,7 @@ export const sendSmsW = param => https.get('/inform-user/send-sms', param)
 export const regionTree = param => https.get('/region/tree', param)
 
 /** *
- * 登录客户的号信息(到期时间) w
+ * 登录客户的号信息(到期时间) w
  */
 export const accountDet = data => {
 	return https.get('/merchant/login-account', data)

+ 1 - 1
hdApp/src/pages.json

@@ -220,7 +220,7 @@
 				{ "path": "admin","style": {"navigationBarTitleText": "个人资料"}},
 				{ "path": "sel-member", "style": { "navigationBarTitleText": "客户列表" } },
 				{ "path": "achieve", "style": { "navigationBarTitleText": "员工业绩" } },
-				{ "path": "miniAutoLogin", "style": { "navigationBarTitleText": "绑定号" } }
+				{ "path": "miniAutoLogin", "style": { "navigationBarTitleText": "绑定号" } }
 			]
 		},
 		{

+ 7 - 0
hdApp/src/pagesClient/official/apply.vue

@@ -325,6 +325,13 @@ export default {
           // #endif
 
         }
+
+        //去失信人员列表
+        if(this.option.fromType && this.option.fromType == 2){
+          this.$util.pageTo({url: "/admin/ll/list", type:2})
+          return
+        }
+
         if(this.option.itemId && Number(this.option.itemId)>0 && this.option.ghsShopId && Number(this.option.ghsShopId)>0){
           ghsInfo({shopId:this.option.ghsShopId}).then(resInfo => {
             let ghsId = resInfo.data.id

+ 1 - 1
hdApp/src/pagesClient/official/callback.vue

@@ -34,7 +34,7 @@
             <block v-if="pageStatus == 1">
               <div class="prompt-tit" style="color: #09bb07">恭喜您, 续订成功!</div>
               <div>
-                <span class="app-color-2">你的号有效期已延长至:</span>
+                <span class="app-color-2">你的号有效期已延长至:</span>
                 <span>{{ data.deadline | formatTime('YYYY-MM-DD hh:mm:ss') }}</span>
               </div>
             </block>

+ 1 - 1
hdApp/src/pagesStore/me/cashSet.vue

@@ -119,7 +119,7 @@ export default {
         {
           name: "cashAccount",
           rule: ["required"],
-          msg: ["请输入号"],
+          msg: ["请输入号"],
         },
         {
           name: "cashBank",