18bee78ebcacfad96914d4cdcd11d5f449d0a1f6..72bd5f52e9c1566da2a8021195b8b378df9733cf
2021-06-11 zengh
逻辑修改
72bd5f diff | tree
2021-06-11 zengh
Merge remote-tracking branch 'origin/master'
1dfaa9 diff | tree
2021-06-11 zengh
安卓端初版
5514c2 diff | tree
6 files modified
26 ■■■■■ changed files
pages/loging/loging.vue 4 ●●● patch | view | raw | blame | history
pages/myself/childen/xinxi.vue 10 ●●●●● patch | view | raw | blame | history
pages/poput/workbench/policeDetails/policeDetails.vue 2 ●●● patch | view | raw | blame | history
pages/workbench/workbench.vue 2 ●●● patch | view | raw | blame | history
store/actions.js 5 ●●●●● patch | view | raw | blame | history
store/mutations.js 3 ●●●● patch | view | raw | blame | history
pages/loging/loging.vue
@@ -48,11 +48,13 @@
            judgeUse() {
                var login = WxStorage.get("init") //重复登入
                var name = WxStorage.get("name")
                var userID = WxStorage.get("ids")
                // console.log(login);
                if (login == "true" && name != '') {
                    //获取用户信息
                    var data = {
                        userName: name
                        userName: name,
                        userID:userID
                    }
                    this.$store.commit('getUse', data)
                    wx.reLaunch({
pages/myself/childen/xinxi.vue
@@ -16,11 +16,11 @@
            </view>
            <view class="row row-base-info">
                <view class="title">昵称</view>
                <view class="msg">{{datalist.nick_name}}</view>
                <view class="msg">{{user.name}}</view>
            </view>
            <view class="row row-base-info">
                <view class="title">电话</view>
                <view class="msg">{{phon}}</view>
                <view class="msg">{{user.phone}}</view>
            </view>
            <view class="row row-base-info">
                <view class="title">邮箱</view>
@@ -48,6 +48,7 @@
</template>
<script>
import WxStorage from "../../../static/lib/wxStorage.js" //微信Storage
export default{
    data(){
        return{
@@ -74,9 +75,10 @@
        //获取客户信息
        getUserInfo(){
            var that = this;
            var id = JSON.stringify(this.$store.state.puserID);
            var id = JSON.stringify(that.$store.state.puserID);
            var userID = WxStorage.get("ids")
            console.log(userID)
            uni.request({
                url: 'http://s16s652780.51mypc.cn/api/blade-user/details?id='+this.$store.state.puserID,
                method:'POST',
                success: (res) => {
pages/poput/workbench/policeDetails/policeDetails.vue
@@ -72,7 +72,7 @@
                    mask: true
                })
                wx.request({
                    url: 'https://web.byisf.com/api/blade-jfpts/feedback/feedback/saves', //仅为示例,并非真实接口地址。
                    url: 'http://s16s652780.51mypc.cn/api/blade-jfpts/feedback/feedback/saves', //仅为示例,并非真实接口地址。
                    data: dataList,
                    method: 'POST',
                    header: {
pages/workbench/workbench.vue
@@ -105,7 +105,7 @@
                        securityId: id
                    } : '',
                    that = this;
                    console.log(this.$store.state.puserID)
                    console.log(this.$store.state.puserID,'worke')
                wx.request({
                    url: url,
                    data: data,
store/actions.js
@@ -16,7 +16,7 @@
                },
            ],
            pasw = md5(data.pass),
            url = 'https://web.byisf.com/api/blade-auth/oauth/token?tenantId=000000&username=' + data.name +
            url = 'http://s16s652780.51mypc.cn/api/blade-auth/oauth/token?tenantId=963841&username=' + data.name +
            ' &password=' + pasw + '&grant_type=password&scope=all&type=account';
        // url ='http://192.168.0.109:82/blade-auth/oauth/token';
        // url ='http://192.168.0.109:82/blade-auth/oauth/token?tenantId=000000&username=admin&password=93369e86dc5fa854a0eaf75558c4039d&grant_type=password';
@@ -36,7 +36,7 @@
            header: {
                // "Content-Type":"",
                "Authorization": "Basic c2FiZXI6c2FiZXJfc2VjcmV0",
                "Tenant-Id": "000000"
                "Tenant-Id": "963841"
                // "Cookie": "JSESSIONID=maOJY05vT2jj4nHwsQGSPgWWVFH1mY-TGWOLYCSh"
            },
@@ -51,7 +51,6 @@
                    // data.userPhon = res.user_id;
                    store.commit('login', data);
                } 
                console.log(res)
            },
            fail: (res) => {
                console.log('失去连接 请稍等');
store/mutations.js
@@ -12,6 +12,7 @@
        //储存用户
        WxStorage.set("init", "true");
        WxStorage.set("name", data.userName);
        WxStorage.set("ids", data.userID);
    },
    loginReset(state) { //重置
        state.loging = false;
@@ -20,7 +21,7 @@
    },
    getUse(state,data){
        state.puserName = data.userName;
        // console.log(state.puserName)
        state.puserID = data.userID;
    },
    getUserData(state,data){
        state.UserData = data;