Merge branch 'master' of http://36.137.93.232:3000/hf/storage

.gitignore

@@ -26,3 +26,4 @@ yarn-error.log*
 *.sw*
 
 build/env.js
+/vue.config.js

src/components/my-modal-pay/index.vue

@@ -107,7 +107,8 @@
             style="padding: 0 5px;flex: 1;display: flex;align-items: flex-start;"
           >
             <div class="label" style="width: 70px;">
-              {{ formData.applyPurType === 0 ? '申购说明：' : '申购内容' }}
+            <!-- {{ formData.applyPurType === 0 ? '申购说明：' : '申购内容' }} -->
+              申购说明：
             </div>
             <div class="value" v-if="type === 'add'">
               <Input v-model="formData.applyAccount" type="textarea" />

src/view/index/msg/msg.vue

@@ -6,8 +6,8 @@
           <Radio :label="1">已读</Radio>
           <Radio :label="0">未读</Radio>
       </RadioGroup>
-      <RadioGroup v-model="params.sourceType" style="margin:0 10px">
+      <RadioGroup v-model="params.sourceType" style="margin:0 10px"  @on-change="readStateChange2">
-          <Radio :label="i.sourceType" v-for="i in uMessageStatisticsClassify" :key="i.sourceType">
+          <Radio :label="i.sourceType" v-for="i in uMessageStatisticsClassify"  :key="i.sourceType">
             {{sourceTypeList[i.sourceType]}}<span style="color:red">({{i.count}})</span>
           </Radio>
       </RadioGroup>
@@ -263,9 +263,11 @@ export default {
                           id: params.row.id
                         }).then(res => {
                           if (res.code === 0) {
+                            alert(111)
                             _this.$Message.info(res.msg || '操作成功')
                             _this.$store.commit('setMsgChange', new Date().getTime())
                             _this.getList()
+                            _this.getMsgState()
                           }
                         })
                       }
@@ -294,6 +296,7 @@ export default {
                           _this.$Message.info(res.msg || '操作成功')
                           _this.$store.commit('setMsgChange', new Date().getTime())
                           _this.getList()
+                          _this.getMsgState()
                         }
                       })
                     }
@@ -356,18 +359,23 @@ export default {
         pageIndex: 1,
         pageSize: 20,
         total: 0,
-        readState: 0,
         userNo:window.localStorage.getItem('jobNo'),
-        readState:1,
+        readState:0,
         search:'',
       },
       uMessageStatisticsClassify:[],
     }
   },
   methods: {
+    readStateChange2(){
+      const v = this
+      v.params.pageIndex = 1
+      v.getList()
+    },
     readStateChange(){
       const v = this
       v.params.pageIndex = 1
+      v.params.sourceType = null
       v.getList()
       v.getMsgState()
     },

src/view/index/store-warning/index.vue

@@ -60,7 +60,8 @@
         </div>
         <div class="row" style="margin-bottom: 10px;display: flex;justify-content: space-between;">
           <div class="col"  style="padding: 0 5px;flex: 1;display: flex;align-items: flex-start;">
-            <div class="label" style="width: 70px;">{{ formData.applyPurType === 0 ? '申购说明：' : '申购内容' }}</div>
+            <!-- <div class="label" style="width: 70px;">{{ formData.applyPurType === 0 ? '申购说明：' : '申购内容' }}</div> -->
+            <div class="label" style="width: 70px;">申购说明:</div>
             <div class="value" v-if="type === 'add'">
               <Input v-model="formData.applyAccount" type="textarea"/>
             </div>

vue.config.js

@@ -1,126 +0,0 @@
-const path = require('path')
-const webpack = require('webpack')
-const CompressionWebpackPlugin = require('compression-webpack-plugin')
-const GenerateAssetPlugin = require('generate-asset-webpack-plugin')
-
-const Timestamp = new Date().getTime()
-
-const createServerConfig = function (compilation) {
-  let config = { version: new Date().getTime() }
-  return JSON.stringify(config)
-}
-
-const resolve = dir => {
-  return path.join(__dirname, dir)
-}
-
-// 项目部署基础
-// 默认情况下，我们假设你的应用将被部署在域的根目录下,
-// 例如：https://www.my-app.com/
-// 默认：'/'
-// 如果您的应用程序部署在子路径中，则需要在这指定子路径
-// 例如：https://www.foobar.com/my-app/
-// 需要将它改为'/my-app/'
-// iview-admin线上演示打包路径： https://file.iviewui.com/admin-dist/
-const BASE_URL = process.env.NODE_ENV === 'production'
-  ? '/'
-  : '/';
-const ip = 'http://120.79.80.64:8050'
-//const ip = 'http://192.168.1.80:8300'
-module.exports = {
-  devServer: {
-    port: "8080", //代理端口
-    open: false, //项目启动时是否自动打开浏览器，我这里设置为false,不打开，true表示打开
-    headers: {
-      'Access-Control-Allow-Origin': '*',
-    },
-    proxy: {
-      '/cloudApi': {
-        target: ip,
-        ws: true,
-        pathRewrite: {
-          '^/api': '/'
-        }
-      },
-      '/purchaseContract': {
-        target: ip,
-        ws: true,
-        pathRewrite: {
-          '^/api': '/'
-        }
-      },
-      '/supplier': {
-        target: ip,
-        ws: true,
-        pathRewrite: {
-          '^/api': '/'
-        }
-      },
-      '/javaApi': {
-        target: ip,
-        ws: true,
-        pathRewrite: {
-          '^/api': '/'
-        }
-      },
-      
-
-    }
-  },
-  // Project deployment base
-  // By default we assume your app will be deployed at the root of a domain,
-  // e.g. https://www.my-app.com/
-  // If your app is deployed at a sub-path, you will need to specify that
-  // sub-path here. For example, if your app is deployed at
-  // https://www.foobar.com/my-app/
-  // then change this to '/my-app/'
-  publicPath: BASE_URL,
-  // tweak internal webpack configuration.
-  // see https://github.com/vuejs/vue-cli/blob/dev/docs/webpack.md
-  // 如果你不需要使用eslint，把lintOnSave设为false即可
-  lintOnSave: true,
-  chainWebpack: config => {
-    config.resolve.alias
-      .set('@', resolve('src')) // key,value自行定义，比如.set('@@', resolve('src/components'))
-      .set('_c', resolve('src/components'))
-  },
-  // 设为false打包时不生成.map文件
-  productionSourceMap: false,
-  configureWebpack: config => {
-    // 开发环境不需要gzip 生产环境时清空所有console
-    if (process.env.NODE_ENV !== 'production') return
-    else config.optimization.minimizer[0].options.terserOptions.compress.drop_console = true
-    config.plugins.push(
-      new CompressionWebpackPlugin({
-        // 正在匹配需要压缩的文件后缀
-        test: /\.(js|css|svg|woff|ttf|json|html)$/,
-        // 大于10kb的会压缩
-        threshold: 10240
-        // 其余配置查看compression-webpack-plugin
-      })
-    )
-    config.plugins.push(
-      new GenerateAssetPlugin({
-        filename: 'version.json',
-        fn: (compilation, cb) => {
-          cb(null, createServerConfig(compilation))
-        },
-        extraFiles: []
-      })
-    )
-    config.plugins.push(
-      new webpack.ProvidePlugin({
-        $: 'jquery',
-        jQuery: 'jquery',
-        'window.jQuery': 'jquery'
-      })
-    )
-    config.output.filename = `js/[name].${Timestamp}.js`
-    config.output.chunkFilename = `js/[name].${Timestamp}.js`
-  }
-  // 这里写你调用接口的基础路径，来解决跨域，如果设置了代理，那你本地开发环境的axios的baseUrl要写为 '' ，即空字符串
-  // devServer: {
-  //   proxy: 'localhost:3000'
-  // }
-
-}