updated

pages/goods/components/procurement_card.vue

@@ -174,7 +174,7 @@ export default {
 .card .card_content_img {
     width: 136rpx;
     height: 136rpx;
-    border: 1px dotted #333333;
+    border: 1px dotted #E1E1E1;
     box-sizing: border-box;
     margin-right: 24rpx;
 }

pages/goods/procurement.vue

@@ -183,14 +183,14 @@ export default {
         ...mapState(['hasLogin'])
     },
     onShow() {
-        if(this.hasLogin){
+        // if(this.hasLogin){
         	this.userInfo = uni.getStorageSync('userInfo')
         	this.pageInfo.userId = this.userInfo.userId
         	this.participate.userId = this.userInfo.userId
         	this.procurementAllList()
-        }else{
-        	this.$api.redirectTo('/pages/login/login')
-        }
+        // }else{
+        // 	this.$api.redirectTo('/pages/login/login')
+        // }
     },
     onLoad() {
         uni.$on('refreshAddData', () => {
@@ -206,6 +206,7 @@ export default {
         }
     },
     onPullDownRefresh() {
+        this.isLastPage = false
         this.procurementList = []
         this.procurementAllList()
         uni.stopPullDownRefresh()
@@ -354,7 +355,7 @@ export default {
         // 删除 退出
         async procurementUpdate(type, id) {
             const form = {
-                id: `${this.proDataInfo.sid}`,
+                id: `${type === 0 ? this.proDataInfo.id : this.proDataInfo.sid}`,
                 userId: this.userInfo.userId,
                 procurementType: type
             }

pages/goods/procurement_info.vue

@@ -262,7 +262,7 @@ export default {
         // 详情
         async procurementDetail(id) {
             try {
-                const { data } = await this.ProcurementService.procurementDetail({ id: id })
+                const { data } = await this.ProcurementService.procurementDetail({ id: id, userId: this.userInfo.userId })
                 this.procurement = data.procurement
                 this.procurementList = data.procurementList
                 this.skeletonShow = false
@@ -345,7 +345,7 @@ export default {
 .img {
     width: 136rpx;
     height: 136rpx;
-    border: 1px dotted black;
+    border: 1px dotted #E1E1E1;
     margin-right: 24rpx;
 }
 .procure_info {

services/config.env.js

@@ -3,9 +3,9 @@ if(process.env.NODE_ENV === 'development'){
     // 开发环境
     // URL_CONFIG = 'http://192.168.2.67:18002'	 //智捷联调地址
     // URL_CONFIG = 'http://192.168.2.68:18002'	 //涛涛联调地址
-    // URL_CONFIG = 'http://192.168.2.102:18002' //志国联调地址
+    URL_CONFIG = 'http://192.168.2.102:18002' //志国联调地址
     // URL_CONFIG = 'http://192.168.2.103:18002' // 陈凯联调
-    URL_CONFIG = 'https://core-b.caimei365.com'
+    // URL_CONFIG = 'https://core-b.caimei365.com'
     // URL_CONFIG = 'https://core.caimei365.com'  
 }else{
     // 生产环境