zengh
2022-05-27 ac1c4597e055f2d821498e4fe762e388a25ee774
服务器配置
29 files modified
108 ■■■■ changed files
api/mock/home.js 12 ●●●●● patch | view | raw | blame | history
manifest.json 2 ●●● patch | view | raw | blame | history
pages/business/businesscopy2.vue 1 ●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAFFPX/map.vue 2 ●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAXC/map.vue 2 ●●● patch | view | raw | blame | history
pages/groupChat/chatingcopy.vue 1 ●●●● patch | view | raw | blame | history
pages/home/home.vue 33 ●●●● patch | view | raw | blame | history
pages/investigation/prizesquare.vue 1 ●●●● patch | view | raw | blame | history
pages/loging/loging.vue 27 ●●●●● patch | view | raw | blame | history
pages/registerUser/registerUser.vue 24 ●●●●● patch | view | raw | blame | history
store/state.js 2 ●●● patch | view | raw | blame | history
unpackage/res/icons/1024x1024.png patch | view | raw | blame | history
unpackage/res/icons/120x120.png patch | view | raw | blame | history
unpackage/res/icons/144x144.png patch | view | raw | blame | history
unpackage/res/icons/152x152.png patch | view | raw | blame | history
unpackage/res/icons/167x167.png patch | view | raw | blame | history
unpackage/res/icons/180x180.png patch | view | raw | blame | history
unpackage/res/icons/192x192.png patch | view | raw | blame | history
unpackage/res/icons/20x20.png patch | view | raw | blame | history
unpackage/res/icons/29x29.png patch | view | raw | blame | history
unpackage/res/icons/40x40.png patch | view | raw | blame | history
unpackage/res/icons/58x58.png patch | view | raw | blame | history
unpackage/res/icons/60x60.png patch | view | raw | blame | history
unpackage/res/icons/72x72.png patch | view | raw | blame | history
unpackage/res/icons/76x76.png patch | view | raw | blame | history
unpackage/res/icons/80x80.png patch | view | raw | blame | history
unpackage/res/icons/87x87.png patch | view | raw | blame | history
unpackage/res/icons/96x96.png patch | view | raw | blame | history
uview-ui/components/u-full-screen/u-full-screen.vue 1 ●●●● patch | view | raw | blame | history
api/mock/home.js
@@ -18,11 +18,13 @@
export function fakeBannerList() {
    return new Promise((resolute, reject) => {
        try {
            const list = [{
                id: '1',
                img: 'http://61.131.136.25:2081/zhba/upload/20210913/3d9fd42a80094268ab83fdd3bcb18541.jpg',
                url: '../article/article_detail?detailData=' + '{"id":"119"}'
            }, {
            const list = [
            //     {
            //     id: '1',
            //     img: 'http://61.131.136.25:2081/zhba/upload/20210913/3d9fd42a80094268ab83fdd3bcb18541.jpg',
            //     url: '../article/article_detail?detailData=' + '{"id":"119"}'
            // },
            {
                id: '2',
                img: 'http://61.131.136.25:2081/zhba/upload/20220216/b3d4c45eb7202974b3155318914df829.jpg',
                url: '../article/article_video?detailData=' + '{"id":981,"title":"千万别被“冰墩墩”的诱惑冲昏头 小心被盯上!","content":"","url":"http://61.131.136.25:2081/zhba/upload/20220216/b3d4c45eb7202974b3155318914df829.jpg","videoUrl":"http://61.131.136.25:2081/zhba/upload/depl/aed8c0b92b8f49b18c7c2d5056290af8.mp4","createTime":"2022-02-15 00:00:00","updateTime":"2022-02-16 22:49:21","sourceId":"","sourceName":"中国警察网","articleType":"ksp003","recommend":-1,"publish":"0","iscomment":"","iswords":"0","wordsContent":"","type":0}'
manifest.json
@@ -3,7 +3,7 @@
    "appid" : "__UNI__1A57486",
    "description" : "",
    "versionName" : "1.0.0",
    "versionCode" : "100",
    "versionCode" : 1,
    "transformPx" : false,
    "networkTimeout" : {
        "request" : 10000
pages/business/businesscopy2.vue
@@ -130,7 +130,6 @@
            //获取用户信息
            getUser() {
                var that = this;
                debugger
                uni.request({
                    url: that.$store.state.BaopiAPI + '/blade-user/detail',
                    method: 'GET',
pages/grabOrders/grabOrdersZAFFPX/map.vue
@@ -240,7 +240,7 @@
                                });
                                setTimeout(function() {
                                    uni.redirectTo({
                                        url: "/pages/grabOrders/grabOrdersZAYWXC/grabOrders?in=1"
                                        url: "/pages/grabOrders/grabOrdersZAFFPX/grabOrders?in=1"
                                    })
                                }, 2200)
                            } else {
pages/grabOrders/grabOrdersZAXC/map.vue
@@ -288,7 +288,7 @@
                                });
                                setTimeout(function() {
                                    uni.redirectTo({
                                        url: "/pages/grabOrders/grabOrdersZAYWXC/grabOrders?in=1"
                                        url: "/pages/grabOrders/grabOrdersZAXC/grabOrders?in=1"
                                    })
                                }, 2200)
                            } else {
pages/groupChat/chatingcopy.vue
@@ -233,7 +233,6 @@
                // 页数加1
                let msg = datas.message()            
                let maxpages = msg.length
                debugger
                if(msg.length > (page + 1) * 10) {
                    maxpages = (page + 1) * 10
                    this.nowpage++
pages/home/home.vue
@@ -4,7 +4,7 @@
        <!-- <view> -->
        <u-popup v-model="showOnceLogin" mode="center" :closeable="true" :custom-style="OnceLoginStyle"
            class="OnceLoginStyles">
            <img class="imgs1" src="../../static/home/img/laba2.png" mode=""></img>
            <image class="imgs1" src="/static/home/img/laba2.png" mode=""></image>
            <view class="onceBody">
                <view class="names">
                    管理员{{$store.state.puserName}}:
@@ -193,6 +193,25 @@
            this.getNum();
        },
        onLoad() {
            //检查应用版本号
            // console.log("版本号为++++"+ plus.runtime.versionCode)
            // var code = plus.runtime.versionCode;
            // uni.showToast({
            //     title: '提交成功'+code,
            //     duration: 2000
            // });
            var that = this;
            // uni.request({
            //     url: this.$store.state.piAPI + '/version/detail?id=1',
            //     method: 'GET',
            //     success: (res) => {
            //         if(res.data.data.version > code){
            //             that.ccc(res.data.data);
            //         }
            //     }
            // });
            //this.ccc();
            // 后续将改为与后端联动
            // 加载banner数据
            fakePosition().then(data => {
@@ -262,15 +281,11 @@
            }
        },
        methods: {
            ccc() {
                let content = `
                    1. 修复badge组件的size参数无效问题<br>
                    2. 新增Modal模态框组件<br>
                    3. 新增压窗屏组件,可以在APP上以弹窗的形式遮盖导航栏和底部tabbar<br>
                    4. 修复键盘组件在微信小程序上遮罩无效的问题
                `;
            ccc(data) {
                let content =data.content;
                var url = data.address;
                this.$u.route("/uview-ui/components/u-full-screen/u-full-screen?content=" + content +
                    "&src=1345678");
                    "&src="+url);
            },
            aaa(i) {
                let key = i == 1 ? 'keke' : 'song1';
pages/investigation/prizesquare.vue
@@ -13,7 +13,6 @@
        methods: {},
        mounted() {},
        onLoad: function(options) {
            debugger
            console.log(options)
                var that = this,
                info_detail = options;
pages/loging/loging.vue
@@ -15,7 +15,7 @@
                <view class="cell">
                    <view class="name">账号</view>
                    <view class="input-box">
                        <input type="text" v-model="names" placeholder="请输入账号" class="ipt" placeholder-class="hold"
                        <input type="text" v-model="names" placeholder="帐号为姓+身份证后4位" class="ipt" placeholder-class="hold"
                            @blur="handleInputCheck" />
                    </view>
                </view>
@@ -61,12 +61,37 @@
                disabled: true
            }
        },
        onLoad() {
            //检查应用版本号
            console.log("版本号为++++"+ plus.runtime.versionCode)
            var code = plus.runtime.versionCode;
            // uni.showToast({
            //     title: '提交成功'+code,
            //     duration: 2000
            // });
            var that = this;
            uni.request({
                url: this.$store.state.piAPI + '/version/detail?id=1',
                method: 'GET',
                success: (res) => {
                    if(res.data.data.version > code){
                        that.ccc(res.data.data);
                    }
                }
            });
        },
        computed: {
            OURpass() {
                return this.$store.state.loging;
            }
        },
        methods: {
            ccc(data) {
                let content =data.content;
                var url = data.address;
                this.$u.route("/uview-ui/components/u-full-screen/u-full-screen?content=" + content +
                    "&src="+url);
            },
            judgeUse() {
                
                // var main = plus.android.runtimeMainActivity();//获取当前的Activity
pages/registerUser/registerUser.vue
@@ -14,20 +14,21 @@
                :required="true">
                <u-input v-model="form.signals" placeholder="请输入警号" />
            </u-form-item>
            <u-form-item label="工作单位" left-icon="home-fill" label-width="200" :required="true">
            <!-- <u-form-item label="工作单位" left-icon="home-fill" label-width="200" :required="true">
                <u-radio-group v-model="jobValue">
                    <u-radio v-for="(item, index) in jobList" :key="index" :name="item.name" :disabled="item.disabled">
                        {{item.name}}
                    </u-radio>
                </u-radio-group>
            </u-form-item>
            </u-form-item> -->
            <u-form-item v-show="jobValue == '有'" label="单位名称" prop="jobUnit" label-width="200" left-icon="home"
            <u-form-item v-show="form.role == '民警'" label="单位名称" prop="jobUnit" label-width="200" left-icon="home"
                :required="true">
                <u-input v-model="form.jobUnit" placeholder="请输入单位名称" />
            </u-form-item>
            <u-form-item v-show="jobValue == '有'" label="工作地点" prop="xq" left-icon="map-fill" label-width="200"
            <u-form-item v-show="form.role == '民警'" label="工作地点" prop="xq" left-icon="map-fill" label-width="200"
                :required="true">
                <u-field :disabled="true" style="width: 100%;" label-width="0" v-model="form.xq" type="textarea"
                    placeholder="请选择工作地点" :fixed="true">
@@ -36,7 +37,7 @@
                </u-field>
            </u-form-item>
            <u-form-item label="居住地" prop="address" left-icon="map" label-width="200" :required="true">
            <u-form-item v-show="form.role != '民警'" label="居住地" prop="address" left-icon="map" label-width="200" :required="true">
                <u-field :disabled="true" style="width: 100%;" label-width="0" v-model="form.address" type="textarea"
                    placeholder="请选择居住地" :fixed="true">
                    <u-icon @click="placeClick" name="map-fill" slot="right" size="44" label="定位" label-pos="bottom"
@@ -283,7 +284,7 @@
                        trigger: ['change', 'blur'],
                    }],
                    address: [{
                        required: true,
                        required: false,
                        message: '请选择居住地',
                        // 可以单个或者同时写两个触发验证方式 
                        trigger: ['change', 'blur'],
@@ -408,13 +409,18 @@
                //判断是否必填警号和工作地点
                if (that.form.role == "民警") {
                    that.rules.signals[0].required = true;
                }
                if (that.jobValue == "有") {
                    that.rules.jobUnit[0].required = true;
                    that.rules.xq[0].required = true;
                    that.rules.address[0].required = false;
                }else{
                    that.rules.address[0].required = true;
                }
                // if (that.jobValue == "有") {
                //     that.rules.jobUnit[0].required = true;
                //     that.rules.xq[0].required = true;
                // }
                that.$refs.uForm.validate(valid => {
                    if (valid) {
                        that.registerEvent()
store/state.js
@@ -17,7 +17,7 @@
    roleid: '', //角色id
    Jurisdiction: '', //角色辖区
    logPath: '',
    // piAPI: apis.api,
    piAPI: apis.api,
    // piAPI: 'http://61.131.136.25:2082/api/',
    //piAPI: 'http://192.168.0.114:83/',
    //piAPI: 'http://61.131.136.25:2082/api/',
unpackage/res/icons/1024x1024.png

unpackage/res/icons/120x120.png

unpackage/res/icons/144x144.png

unpackage/res/icons/152x152.png

unpackage/res/icons/167x167.png

unpackage/res/icons/180x180.png

unpackage/res/icons/192x192.png

unpackage/res/icons/20x20.png

unpackage/res/icons/29x29.png

unpackage/res/icons/40x40.png

unpackage/res/icons/58x58.png

unpackage/res/icons/60x60.png

unpackage/res/icons/72x72.png

unpackage/res/icons/76x76.png

unpackage/res/icons/80x80.png

unpackage/res/icons/87x87.png

unpackage/res/icons/96x96.png

uview-ui/components/u-full-screen/u-full-screen.vue
@@ -34,6 +34,7 @@
            },
            confirm() {
                this.closeModal();
                plus.runtime.openURL(this.src)
                console.log(this.src)
            },
            closeModal() {