doum
4 小时以前 98995ef3dff4eefe6658022345276806bd47d557
admin/src/components/business/OperaShopInfoWindow.vue
@@ -175,21 +175,17 @@
                stripe
                border
            >
              <el-table-column prop="type"  label="获得/扣除" align="center" min-width="150px">
              <el-table-column prop="code" label="订单编号"   align="center" min-width="120px" show-overflow-tooltip>  </el-table-column>
              <el-table-column prop="details" label="商品信息"   align="center" min-width="250px" show-overflow-tooltip>
                <template slot-scope="{row}">
                  <span v-if="row.type==0" class="green">获得</span>
                  <span v-else class="red">扣除</span>
                </template>
              </el-table-column>
              <el-table-column prop="code" label="订单编号" fixed align="center" min-width="100px">  </el-table-column>
              <el-table-column prop="details" label="商品信息" fixed align="center" min-width="100px">
                <template slot-scope="{row}">
                  <div v-if="row.goodsorderDetailList && row.goodsorderDetailList.length"  >
                      <div v-for="(item) in row.goodsorderDetailList">【{{item.name}}】销售价:{{item.price||0}} 数量:{{item.goodsNum||0}}</div>
                  <div v-if="row.goodsorderDetailList && row.goodsorderDetailList.length"  style="width: 220px">
                      <div v-for="(item) in row.goodsorderDetailList" style="display: flex">
                        <div style="flex: 1">【{{item.name}}】</div><div style="flex: 1">销售价:{{item.price||0}} 数量:{{item.goodsNum||0}}</div>
                      </div>
                  </div>
                </template>
              </el-table-column>
              <el-table-column prop="price" label="商品总价(元)" align="center" min-width="100px">
              <el-table-column prop="price" label="商品总价(元)" align="center" min-width="100px">
                <template slot-scope="{row}">
                   {{(row.totalPrice || 0) - (row.mailPrice||0)}}
                </template>
@@ -204,9 +200,16 @@
              <el-table-column prop="price" label="实付价格(元)" align="center" min-width="200px"></el-table-column>
              <el-table-column prop="shopSettlement" label="应结算金额(元)" align="center" min-width="150px"></el-table-column>
              <el-table-column prop="orderCode" label="应结算金额(元)" align="center" min-width="150px"></el-table-column>
              <el-table-column prop="orderCode" label="返用户积分" align="center" min-width="150px"></el-table-column>
              <el-table-column prop="orderCode" label="返经销商积分" align="center" min-width="150px"></el-table-column>
              <el-table-column prop="createDate" label="创建" align="center" min-width="200px"></el-table-column>
              <el-table-column prop="returnMemberIntegral" label="返用户积分" align="center" min-width="150px"></el-table-column>
              <el-table-column prop="returnCustomerIntegral" label="返经销商积分" align="center" min-width="150px"></el-table-column>
              <el-table-column prop="payDate" label="支付时间" align="center" min-width="200px"></el-table-column>
              <el-table-column prop="receiveType"  label="取货方式" align="center" min-width="150px">
                <template slot-scope="{row}">
                  <span v-if="row.receiveType  === 0" class="green">配送</span>
                  <span v-else class="red">自提</span>
                </template>
              </el-table-column>
              <el-table-column prop="createDate" label="创建时间" align="center" min-width="200px"></el-table-column>
            </el-table>
            <pagination
                @size-change="handleSizeChange1"