#

zjj

2024-04-12 4fe03b6ba321418a0356e37de44417be03cda5af

#

 pages/login/login.vue

@@ -90,6 +90,10 @@
                <uni-popup-dialog :type="msgType" title="通知" :content="dialogContent" @confirm="dialogConfirm"
                    @close="dialogClose"></uni-popup-dialog>
            </uni-popup>
			
            <uni-popup ref="message" type="message">
                <uni-popup-message type="error" message="网络未连接" :duration="0"></uni-popup-message>
            </uni-popup>
        </view>
        
        <!-- 版本号 -->
@@ -126,7 +130,8 @@
                },
                msgType: 'success',
                filename: '',
                dialogContent: ''
                dialogContent: '',
                messageText:''
            }
        },
        onLoad() {
@@ -139,9 +144,27 @@
            if (!this.url) {
                this.url = {ip: '',port: '',project: ''}
            }
			
        },
        mounted() {
            let that = this
            setInterval(()=>{
                uni.getNetworkType({
                    success: function (res) {
                    console.log(res.networkType);	
                    if(res.networkType != 'wifi'){
                        that.$refs.message.open()
                    }else{
                        that.$refs.message.close()
                    }
					
                    }
                });
            },3000)
        },
        onShow () {
            this.getVersion()
			
        },
        methods: {
            // 显示/隐藏密码

 pages/mat/matSelected.vue

@@ -55,9 +55,9 @@
                    matnr: null,
                    maktx: null,
                    specs: null,
                    batch: null,
                    batch: '',
                    anfme: 0,
                    meter: null
                    meter: ''
                },
                baseIP:'',
                basePORT:'',

 pages/pakin/pakin.vue

@@ -230,6 +230,7 @@
                            that.matData = result.data
                            that.matnr = ''
                            that.matData['batch'] = ''
                            that.matData['meter'] = ''
                            uni.navigateTo({
                                url: "../mat/matSelected",
                                // 通过eventChannel向被打开页面传送数据
@@ -399,14 +400,19 @@
                        return;
                    }
                }
                for (let k of that.dataList) {
                    k.batch = k.batch + '_' + k.meter
                let tmpData = JSON.parse(JSON.stringify(that.dataList))
                for (let k of tmpData) {
                    if(k.batch == '' || k.batch == null) {
                        k.batch = ""
                    }else {
                        k.batch = k.batch + '_' + k.meter
                    }
                }
                uni.request({
                    url: that.baseUrl + '/mobile/comb/auth',
                    data: JSON.stringify({
                        barcode: that.barcode,
                        combMats: that.dataList
                        combMats: tmpData
                    }),
                    method: 'POST',
                    header: {