强制修改默认密码

packageA/account/index.wxml

@@ -56,7 +56,7 @@
 <navigator url="#" class="record" wx:for="{{recordList}}" wx:key="sa_accountclassid">
     <view class="content">
         <view class="title">{{item.type==0?'支出':'收入'}}{{item.source?'-'+item.source:""}}</view>
-        <view class="exp">{{item.accountname}}：{{item.showBalance}}</view>
+        <!-- <view class="exp">{{item.accountname}}：{{item.showBalance}}</view> -->
         <view class="exp">优惠金额：{{item.discountamount}}</view>
         <view class="exp">分类：{{item.class || ' --'}}</view>
         <view class="exp">交易备注：{{item.remarks || ' --'}}</view>

packageA/fittings/modules/product/index.js

@@ -235,10 +235,10 @@ Component({
                         "id": 20230208140203,
                         "content": {
                             "isadmin": 1,
-                            ishasitem:true,
+                            ishasitem: 1,
                             "where": {
                                 "sys_enterpriseid_service": this.data.base.sys_enterpriseid,
-                                ishasitem:true,
+                                ishasitem: 1,
                             },
                             "pageSize": 20,
                             "pageNumber": 1,

packageA/fittings/modules/product/list/index.wxml

@@ -159,14 +159,6 @@
                 {{viewItem.machinemodel || '--'}}
             </view>
         </view>
-        <view class="item">
-            <view class="label">
-                规格
-            </view>
-            <view class="value">
-                {{viewItem.spec || '--'}}
-            </view>
-        </view>
         <view class="item">
             <view class="label">
                 工单号
@@ -191,6 +183,7 @@
                 {{viewItem.workorderstatus || '--'}}
             </view>
         </view>
+        <view class="item"></view>
         <view class="item">
             <view class="label">
                 历史申报数

pages/index/index.js

@@ -30,20 +30,7 @@ Page({
 
 		this.updateMsgCount();
 		this.getAnnunciate();
-		if (getApp().globalData.remindchangepassword_str) wx.showModal({
-			title: "提示",
-			content: getApp().globalData.remindchangepassword_str,
-			confirmText: '前往修改',
-			cancelText: "下次再说",
-			success: ({
-				confirm
-			}) => {
-				getApp().globalData.remindchangepassword_str = null;
-				if (confirm) wx.navigateTo({
-					url: '/pages/index/userCenter/changePassword/index',
-				})
-			},
-		})
+
 		getApp().globalData.http.refreshData = this.refreshData.bind(this);
 		this.getVIndete();
 	},

pages/index/userCenter/changePassword/index.js

@@ -2,9 +2,6 @@ const md5 = require("../../../../utils/md5");
 const _Http = getApp().globalData.http;
 import Toast from '@vant/weapp/toast/toast';
 Page({
-    /**
-     * 页面的初始数据
-     */
     data: {
         from: {
             password: "", //原密码
@@ -15,12 +12,24 @@ Page({
         loading: false,
         confirmPassword: "",
     },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
     onLoad(options) {
-
+        console.log(options)
+        let site = wx.getStorageSync('siteP');
+        if (options.token) {
+            _Http.base({
+                "classname": "webmanage.site.site",
+                "method": "querySite_Parameter",
+                "content": {},
+                accesstoken: options.token
+            }).then(res => {
+                console.log("获取站点数据", res)
+                if (res.msg != '成功') return wx.showToast({
+                    title: res.msg,
+                    icon: "none"
+                });
+                site = res.data;
+            })
+        }
     },
     /* 修改密码 */
     changePassword() {
@@ -49,10 +58,6 @@ Page({
                 title: res.msg,
                 icon: "none"
             })
-            /* Toast({
-                           message: res.msg,
-                           position: 'bottom'
-                       }); */
             this.setData({
                 disabled: true
             })

pages/login/modules/account.js

@@ -69,6 +69,20 @@ Component({
 				"imagecaptcha": this.data.imagecaptcha || '',
 				"systemclient": "wechatsaletool"
 			}).then(res => {
+				if (res.remindchangepassword) return wx.showModal({
+					title: '提示',
+					content: '当前密码为系统初始化密码，请修改后重新登录',
+					showCancel: false,
+					confirmText: "前去修改",
+					complete: () => {
+						wx.navigateTo({
+							url: '/pages/index/userCenter/changePassword/index?token=' + res.account_list[0].token
+						})
+						getCurrentPages()[0].setData({
+							loading: false
+						})
+					}
+				})
 				getCurrentPages()[0].setData({
 					loading: false
 				})
@@ -81,7 +95,6 @@ Component({
 					password: (this.data.memory) ? this.data.password : ''
 				})
 				loginMsg.loginMsg(res);
-				getApp().globalData.remindchangepassword_str = res.remindchangepassword_str;
 			})
 		}
 	}

pages/login/modules/account.wxml

@@ -26,5 +26,5 @@
         bind:change="isMemory">
         记住密码
     </van-checkbox>
-    <navigator url="./retrievePassword" class="view">忘记密码?</navigator>
+    <!-- <navigator url="./retrievePassword" class="view">忘记密码?</navigator> -->
 </view>

pages/login/modules/login.js

@@ -9,11 +9,6 @@ function loginMsg(res) {
             title: '该账号已被停用，无法登录',
             icon: "none"
         });
-        if (item.usertype == 2) return wx.showModal({
-            title: '提示',
-            content: '该账号为区域经理，请使用云链E营销小程序登录',
-            showCancel: false
-        })
         wx.setStorageSync('userrole', item.usertype == 1 ? '业务员' : '经销商');
         wx.setStorageSync('userMsg', item)
         query_userauth();

pages/login/phone.js

@@ -47,7 +47,6 @@ Page({
                             icon: "none"
                         })
                         loginMsg.loginMsg(res);
-                        getApp().globalData.remindchangepassword_str = res.remindchangepassword_str;
                     })
                 } else {
                     console.log('登录失败！' + res.errMsg)