Browse Source

购物车整数

skyblued 3 years ago
parent
commit
3d5da7d84f
2 changed files with 113 additions and 123 deletions
  1. 112 123
      src/views/goods-order/after-sale.tsx
  2. 1 0
      src/views/shop-mall/modal/add-goods-cart/index.tsx

+ 112 - 123
src/views/goods-order/after-sale.tsx

@@ -50,7 +50,7 @@ export default defineComponent({
     return {
       active: '0',
       list: [],
-      dataShow: true, // 判断是否有数据
+      dataShow: false, // 判断是否有数据
       loading: false,
       finished: false,
       show: false,
@@ -83,8 +83,8 @@ export default defineComponent({
     },
 
     async getList() {
-      this.dataShow = true
       //避免重复请求
+      console.log(this.loading , this.finished)
       if (this.loading && this.finished) {
         return
       }
@@ -97,11 +97,7 @@ export default defineComponent({
         // 退货申请列表
         res = await this.getReturnList()
       }
-      // console.log(res)
-      if (!res?.data?.list) {
-        this.dataShow = false
-      }
-      if (res.code === 200 && res.data.list) {
+      if (res && res.code === 200 && res.data.list) {
         let data = res.data
         if (Array.isArray(data.list)) {
           let list = [] as any
@@ -268,123 +264,116 @@ export default defineComponent({
         >
           {tabs.map(tab => (
             <Tab name={tab.name} title={tab.title}>
-              {this.dataShow ? (
-                <>
-                  {this.list.length ? (
-                    <List
-                      loading={this.loading}
-                      finished={this.finished}
-                      finishedText=" "
-                      class={[styles.goodsList]}
-                      onLoad={this.getList}
-                    >
-                      {this.active === tab.name &&
-                        this.list.map((item: any) => (
-                          <>
-                            {item.orderItemList && item.orderItemList.length ? (
-                              item.orderItemList.map((n: any) => (
-                                <CellGroup class={styles.cellGroup}>
-                                  <Item item={n} />
-                                  <Cell
-                                    center
-                                    v-slots={{
-                                      default: () => (
-                                        <div class={styles.btnList}>
-                                          {this.active === '0' &&
-                                          (item.status !== 0 ||
-                                            item.status !== 6) &&
-                                          n.returnStatus < 0 ? (
-                                            <Button
-                                              size="small"
-                                              round
-                                              type="primary"
-                                              onClick={() => {
-                                                this.show = true
-                                                this.setReturnParams(item, n)
-                                              }}
-                                            >
-                                              退货申请
-                                            </Button>
-                                          ) : null}
-                                          {n.returnStatus >= 0 ? (
-                                            <div>
-                                              {returnState[n.returnStatus]}
-                                            </div>
-                                          ) : null}
-                                        </div>
-                                      )
-                                    }}
-                                  ></Cell>
-                                </CellGroup>
-                              ))
-                            ) : (
-                              <CellGroup class={styles.cellGroup}>
-                                <Cell
-                                  title={item.createTime}
-                                  titleClass={styles.payTime}
-                                  value={returnState[item.status]}
-                                  // valueClass={}
-                                ></Cell>
-                                <Item item={item} />
-                                <Cell
-                                  center
-                                  v-slots={{
-                                    default: () => (
-                                      <div class={styles.btnList}>
-                                        {item.status === 1 &&
-                                        !item.deliverySn ? (
-                                          <Button
-                                            size="small"
-                                            round
-                                            onClick={() => {
-                                              this.returnGoodId = item.id
-                                              this.kmsShow = true
-                                            }}
-                                          >
-                                            填写退货快递单号
-                                          </Button>
-                                        ) : null}
-                                        {item.status <= 1 ? (
-                                          <Button
-                                            size="small"
-                                            round
-                                            type="primary"
-                                            onClick={() => {
-                                              this.returnGoodId = item.id
-                                              this.deleteReturnApply()
-                                            }}
-                                          >
-                                            撤销申请
-                                          </Button>
-                                        ) : null}
-                                        {item.status === 2 ? (
-                                          <div class={styles.returnDes}>
-                                            该商品金额已于 {item.handleTime}{' '}
-                                            原路退还
-                                          </div>
-                                        ) : item.status === 3 ? (
-                                          <div class={styles.returnDes}>
-                                            拒绝原因: {item.handleNote}
-                                          </div>
-                                        ) : null}
+              {this.list.length ? (
+                <List
+                  loading={this.loading}
+                  finished={this.finished}
+                  finishedText=" "
+                  class={[styles.goodsList]}
+                  onLoad={this.getList}
+                >
+                  {this.active === tab.name &&
+                    this.list.map((item: any) => (
+                      <>
+                        {item.orderItemList && item.orderItemList.length ? (
+                          item.orderItemList.map((n: any) => (
+                            <CellGroup class={styles.cellGroup}>
+                              <Item item={n} />
+                              <Cell
+                                center
+                                v-slots={{
+                                  default: () => (
+                                    <div class={styles.btnList}>
+                                      {this.active === '0' &&
+                                      (item.status !== 0 ||
+                                        item.status !== 6) &&
+                                      n.returnStatus < 0 ? (
+                                        <Button
+                                          size="small"
+                                          round
+                                          type="primary"
+                                          onClick={() => {
+                                            this.show = true
+                                            this.setReturnParams(item, n)
+                                          }}
+                                        >
+                                          退货申请
+                                        </Button>
+                                      ) : null}
+                                      {n.returnStatus >= 0 ? (
+                                        <div>{returnState[n.returnStatus]}</div>
+                                      ) : null}
+                                    </div>
+                                  )
+                                }}
+                              ></Cell>
+                            </CellGroup>
+                          ))
+                        ) : (
+                          <CellGroup class={styles.cellGroup}>
+                            <Cell
+                              title={item.createTime}
+                              titleClass={styles.payTime}
+                              value={returnState[item.status]}
+                              // valueClass={}
+                            ></Cell>
+                            <Item item={item} />
+                            <Cell
+                              center
+                              v-slots={{
+                                default: () => (
+                                  <div class={styles.btnList}>
+                                    {item.status === 1 && !item.deliverySn ? (
+                                      <Button
+                                        size="small"
+                                        round
+                                        onClick={() => {
+                                          this.returnGoodId = item.id
+                                          this.kmsShow = true
+                                        }}
+                                      >
+                                        填写退货快递单号
+                                      </Button>
+                                    ) : null}
+                                    {item.status <= 1 ? (
+                                      <Button
+                                        size="small"
+                                        round
+                                        type="primary"
+                                        onClick={() => {
+                                          this.returnGoodId = item.id
+                                          this.deleteReturnApply()
+                                        }}
+                                      >
+                                        撤销申请
+                                      </Button>
+                                    ) : null}
+                                    {item.status === 2 ? (
+                                      <div class={styles.returnDes}>
+                                        该商品金额已于 {item.handleTime}{' '}
+                                        原路退还
+                                      </div>
+                                    ) : item.status === 3 ? (
+                                      <div class={styles.returnDes}>
+                                        拒绝原因: {item.handleNote}
                                       </div>
-                                    )
-                                  }}
-                                ></Cell>
-                              </CellGroup>
-                            )}
-                          </>
-                        ))}
-                    </List>
-                  ) : (
-                    <ColResult
-                      btnStatus={false}
-                      classImgSize="SMALL"
-                      tips="暂无数据"
-                    />
-                  )}
-                </>
-              ) : null}
+                                    ) : null}
+                                  </div>
+                                )
+                              }}
+                            ></Cell>
+                          </CellGroup>
+                        )}
+                      </>
+                    ))}
+                </List>
+              ) : (
+                <ColResult
+                  btnStatus={false}
+                  classImgSize="SMALL"
+                  tips="暂无数据"
+                />
+              )}
             </Tab>
           ))}
         </Tabs>

+ 1 - 0
src/views/shop-mall/modal/add-goods-cart/index.tsx

@@ -229,6 +229,7 @@ export default defineComponent({
             max={this.selectItem.stock}
             min={1}
             disabled={this.selectItem.stock <= 0}
+            integer
           />
         </Cell>
         <div class={['btnGroup']} style={{ marginBottom: '8px' }}>