Merge branch 'master' of http://192.168.1.8:3000/Epans/modernDairy

# Conflicts:
#	dist/index.html

.env.development

@@ -7,9 +7,9 @@ ENV = 'development'
 #  VUE_APP_BASE_API = 'http://eam.modernfarming.cn:8000/'
 #  白少后台本地
 # 白少后台本地
-VUE_APP_BASE_API = 'http://192.168.1.56:8082/'
+# VUE_APP_BASE_API = 'http://192.168.1.56:8082/'
 # 线上测试
-# VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
+VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
 # VUE_APP_BASE_API = 'http://127.0.0.1:8082/'
 
 # VUE_APP_BASE_API = 'http://36.155.144.182:18090/'

src/views/custom/subscribe/index.vue

@@ -1491,8 +1491,8 @@ export default {
         // 特殊申购-赠品
         return '已通过'
       }else{
-        // 采购
-        if(cellValue.statue == 2 || cellValue.statue == 3 || cellValue.statue == 5 || cellValue.statue == 9 || cellValue.statue == 11 || cellValue.statue == 13 ){
+        
+        if(cellValue.statue == 2 || cellValue.statue == 3 || cellValue.statue == 5 || cellValue.statue == 9 || cellValue.statue == 11 || cellValue.statue == 13 || cellValue.statue == 15 ){
           return '审核中'
         }else if(cellValue.statue == 7){
           return '已通过'