Browse Source

no message

吕海超 9 months ago
parent
commit
a9317ad0d4
3 changed files with 16 additions and 15 deletions
  1. 4 4
      .env.development
  2. 1 1
      src/components/payStatusPopup/index.vue
  3. 11 10
      src/views/order/cloth/collectCloth.vue

+ 4 - 4
.env.development

@@ -7,10 +7,10 @@ ENV = 'development'
 # 一七生活管理系统/开发环境
 # VUE_APP_BASE_API_HOST = 'http://localhost:9801'
 # VUE_APP_BASE_API = 'http://localhost:9801'
-# VUE_APP_BASE_API_HOST = 'http://139.224.65.227:8091/prod-api'
-# VUE_APP_BASE_API = 'http://139.224.65.227:8091/prod-api'
-VUE_APP_BASE_API_HOST = 'http://192.168.98.9:9801'
-VUE_APP_BASE_API = 'http://192.168.98.9:9801/'
+VUE_APP_BASE_API_HOST = 'http://139.224.65.227:8091/prod-api'
+VUE_APP_BASE_API = 'http://139.224.65.227:8091/prod-api'
+# VUE_APP_BASE_API_HOST = 'http://192.168.98.9:9801'
+# VUE_APP_BASE_API = 'http://192.168.98.9:9801/'
 
 
 # 路由懒加载

+ 1 - 1
src/components/payStatusPopup/index.vue

@@ -157,7 +157,7 @@ export default {
             this.orderInfo = info
             this.type = type
             if (type == 1) {
-                if (info.id) {
+                if (info.id && !this.hidePointer) {
                     this.getClothItemInfo(info)
                 }
             }

+ 11 - 10
src/views/order/cloth/collectCloth.vue

@@ -54,46 +54,47 @@
                             <el-table-column label="序号" type="index" align="center" fixed="left" width="80"> </el-table-column>
                             <el-table-column label="衣物名称" align="center" prop="name">
                                 <template slot-scope="scope">
-                                    <span @click="updateClothItem(scope.$index, 0)">{{ calculateClothName(scope.$index) }}</span>
+                                    <el-button type="text" @click="updateClothItem(scope.$index, 0)">{{ calculateClothName(scope.$index) }}</el-button>
                                 </template>
                             </el-table-column>
                             <el-table-column label="颜色" align="center" width="120">
                                 <template slot-scope="scope">
-                                    <span @click="updateClothItem(scope.$index, 2)">
+                                    <el-button type="text" @click="updateClothItem(scope.$index, 2)">
                                         <template v-for="(color, index) in scope.row.orderClothColorDTOS">
                                             {{ index == 0 ? color.clothColorName : ',' + color.clothColorName }}
                                         </template>
-                                    </span>
+                                    </el-button>
                                 </template>
                             </el-table-column>
                             <el-table-column label="衣服品牌" align="center" prop="name" width="120">
                                 <template slot-scope="scope">
-                                    <span @click="updateClothItem(scope.$index, 3)">{{ scope.row.clothBrandName }}</span>
+                                    <el-button type="text" @click="updateClothItem(scope.$index, 3)">{{ scope.row.clothBrandName }}</el-button>
                                 </template>
                             </el-table-column>
                             <el-table-column label="瑕疵" align="center">
                                 <template slot-scope="scope">
-                                    <span @click="updateClothItem(scope.$index, 4)">
+                                    <el-button type="text" @click="updateClothItem(scope.$index, 4)">
                                         <template v-for="(color, index) in scope.row.orderClothFlawDTOS">
                                             {{ index == 0 ? color.clothFlawName : ',' + color.clothFlawName }}
                                         </template>
-                                    </span>
+                                    </el-button>
                                 </template>
                             </el-table-column>
                             <el-table-column label="洗涤方式" align="center" width="80">
                                 <template slot-scope="scope">
-                                    <span @click="changeClothWashMode(scope.$index)" style="color: #409eff">{{ scope.row.clothWashModeName }}</span>
+                                    <el-button type="text" @click="changeClothWashMode(scope.$index)" style="color: #409eff">{{ scope.row.clothWashModeName }}</el-button>
                                 </template>
                             </el-table-column>
                             <el-table-column label="特殊处理(元)" align="center" prop="clothWashDayNum" width="120">
                                 <template slot-scope="scope">
-                                    <span style="color: #ff4949" @click="changeClothSpecialPriceEvent(scope.$index)">{{ calculateClothSpecialPrice(scope.$index) }}</span>
+                                    <el-button type="text" style="color: #ff4949" @click="changeClothSpecialPriceEvent(scope.$index)">¥{{ calculateClothSpecialPrice(scope.$index) }}</el-button>
                                 </template>
                             </el-table-column>
                             <el-table-column label="单价(元)" align="center" prop="defaultPrice" width="100">
                                 <template slot-scope="scope">
-                                    <span style="color: #ff4949" v-if="scope.row.isChangePrice == 'Y'" @click="changeClothDefaultPriceEvent(scope.$index)">{{ scope.row.defaultPrice }}</span>
-                                    <span v-else>{{ scope.row.defaultPrice }}</span>
+                                    <!-- style="color: #ff4949" -->
+                                    <el-button type="text"  v-if="scope.row.isChangePrice == 'Y'" @click="changeClothDefaultPriceEvent(scope.$index)">¥{{ scope.row.defaultPrice }}</el-button>
+                                    <span v-else>¥{{ scope.row.defaultPrice }}</span>
                                 </template>
                             </el-table-column>
                             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200">