Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_vue_store

src/api/server/index.js

@@ -18,6 +18,7 @@ const api = {
   dispatchOrders: '/server/dispatchOrders',
   OrderStatus: '/server/OrderStatus',
   OrderDeatil: '/server/orderDetail',
+  delOrder: '/server/delOrder',
   listByIds: '/server/listByIds',
 }
 /**
@@ -203,3 +204,14 @@ export function orderStatusList(data) {
     data,
   })
 }
+/**
+ * 删除
+ * @param {*} data
+ */
+export function delOrder(data) {
+  return axios({
+    url: api.delOrder,
+    method: 'post',
+    data,
+  })
+}

src/api/server/recovery.js

@@ -16,6 +16,7 @@ const api = {
   cancelOrder: '/recovery/cancelOrder',
   orderStatus: '/recovery/orderStatus',
   orderDetail: '/recovery/orderDetail',
+  orderDel: '/recovery/orderDel',
   completeOrder: '/recovery/completeOrder',
 }
 /**
@@ -181,3 +182,14 @@ export function completeOrder(data) {
     data,
   })
 }
+/**
+ * 订单删除
+ * @param {*} data
+ */
+export function orderDel(data) {
+  return axios({
+    url: api.orderDel,
+    method: 'post',
+    data,
+  })
+}

src/components/SelectGoods/SelectGoods.vue

@@ -1,6 +1,31 @@
 <template>
   <div>
     <a-button @click="handleSelectGoods">选择商品</a-button>
+    <a-table
+      v-show="selectedItems.length"
+      class="table-goodsList"
+      rowKey="goods_id"
+      :columns="columns"
+      :dataSource="selectedItems"
+      :pagination="false"
+    >
+      <!-- 商品信息 -->
+      <template slot="item" slot-scope="item">
+        <GoodsItem
+          :data="{
+            image: item.goods_image,
+            imageAlt: '商品图片',
+            title: item.goods_name,
+            subtitle: `¥${item.goods_price_min}`,
+          }"
+          :subTitleColor="true"
+        />
+      </template>
+      <!-- 操作项 -->
+      <span slot="action" slot-scope="text, item, index">
+        <a v-action:delete @click="handleDeleteItem(index)">删除</a>
+      </span>
+    </a-table>
     <GoodsModal
       ref="GoodsModal"
       :multiple="multiple"
@@ -15,37 +40,39 @@
 import PropTypes from 'ant-design-vue/es/_util/vue-types'
 import cloneDeep from 'lodash.clonedeep'
 import { GoodsModal } from '@/components/Modal'
+import { GoodsItem } from '@/components/Table'
 
 const columns = [
   {
     title: '商品ID',
-    dataIndex: 'goods_id'
+    dataIndex: 'goods_id',
   },
   {
     title: '商品信息',
-    scopedSlots: { customRender: 'item' }
+    scopedSlots: { customRender: 'item' },
   },
   {
     title: '库存总量',
-    dataIndex: 'stock_total'
+    dataIndex: 'stock_total',
   },
   {
     title: '操作',
     width: '180px',
     dataIndex: 'action',
-    scopedSlots: { customRender: 'action' }
+    scopedSlots: { customRender: 'action' },
-  }
+  },
 ]
 
 // 商品选择器组件
 export default {
   name: 'SelectGoods',
   components: {
-    GoodsModal
+    GoodsModal,
+    GoodsItem,
   },
   model: {
     prop: 'value',
-    event: 'change'
+    event: 'change',
   },
   props: {
     // 多选模式, 如果false为单选
@@ -53,7 +80,7 @@ export default {
     // 最大选择的数量限制, multiple模式下有效
     maxNum: PropTypes.integer.def(100),
     // 默认选中的商品
-    defaultList: PropTypes.array.def([])
+    defaultList: PropTypes.array.def([]),
   },
   data() {
     return {
@@ -61,7 +88,7 @@ export default {
       // 已选择的商品列表
       selectedItems: [],
       // 已选择的商品ID集
-      selectedGoodsIds: []
+      selectedGoodsIds: [],
     }
   },
   watch: {
@@ -74,19 +101,17 @@ export default {
         if (val.length && !selectedItems.length) {
           this.onUpdate(cloneDeep(val))
         }
-      }
-    }
       },
-  created () {
     },
+  },
+  created() {},
   methods: {
-
     // 更新数据
     onUpdate(selectedItems) {
       if (this.multiple || !selectedItems.length) {
         // 多选模式
         this.selectedItems = selectedItems
-        this.selectedGoodsIds = selectedItems.map(item => item.goods_id)
+        this.selectedGoodsIds = selectedItems.map((item) => item.goods_id)
       } else {
         // 单选模式
         const single = selectedItems[selectedItems.length - 1]
@@ -117,12 +142,10 @@ export default {
     // 触发change事件
     onChange() {
       const { multiple, selectedGoodsIds } = this
-      const sGoodsIds = multiple ? selectedGoodsIds : (selectedGoodsIds.length ? selectedGoodsIds[0] : undefined)
+      const sGoodsIds = multiple ? selectedGoodsIds : selectedGoodsIds.length ? selectedGoodsIds[0] : undefined
-      this.$emit('select', multiple ? this.selectedItems : this.selectedItems[0])
       return this.$emit('change', sGoodsIds)
-    }
+    },
-
+  },
-  }
 }
 </script>
 

src/views/client/wxapp/Setting.vue

@@ -13,9 +13,7 @@
           </div>
         </a-form-item>
         <a-form-item class="mt-30" label="小程序 AppID" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input
+          <a-input v-decorator="['app_id', { rules: [{ required: true, message: '请输入小程序AppID' }] }]" />
-            v-decorator="['app_id', { rules: [{ required: true, message: '请输入小程序AppID' }] }]"
-          />
           <p class="form-item-help">
             <small>登录微信小程序平台，开发 - 开发管理 - 开发设置，记录AppID (小程序ID)</small>
           </p>
@@ -29,7 +27,62 @@
             <small>登录微信小程序平台，开发 - 开发管理 - 开发设置，记录AppSecret (小程序密钥)</small>
           </p>
         </a-form-item>
+        <a-form-item class="mt-30" label="同城送" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-radio-group v-decorator="['same_city', { rules: [{ required: true }] }]">
+            <a-radio :value="true">开启</a-radio>
+            <a-radio :value="false">关闭</a-radio>
+          </a-radio-group>
+          <div class="form-item-help">
+            <small>注：如关闭，用户则无法通过微信小程序端访问同城送</small>
+          </div>
+        </a-form-item>
+        <a-form-item class="mt-30" label="新人首礼" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-radio-group v-decorator="['new_first_gift', { rules: [{ required: true }] }]">
+            <a-radio :value="true">开启</a-radio>
+            <a-radio :value="false">关闭</a-radio>
+          </a-radio-group>
+          <div class="form-item-help">
+            <small>注：如关闭，用户则无法通过微信小程序端访问新人首礼</small>
+          </div>
+        </a-form-item>
+        <a-form-item class="mt-30" label="大牌正品" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-radio-group v-decorator="['big_brand', { rules: [{ required: true }] }]">
+            <a-radio :value="true">开启</a-radio>
+            <a-radio :value="false">关闭</a-radio>
+          </a-radio-group>
+          <div class="form-item-help">
+            <small>注：如关闭，用户则无法通过微信小程序端访问大牌正品</small>
+          </div>
+        </a-form-item>
+        <a-form-item class="mt-30" label="新品首发" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-radio-group v-decorator="['new_product', { rules: [{ required: true }] }]">
+            <a-radio :value="true">开启</a-radio>
+            <a-radio :value="false">关闭</a-radio>
+          </a-radio-group>
+          <div class="form-item-help">
+            <small>注：如关闭，用户则无法通过微信小程序端访问新品首发</small>
+          </div>
+        </a-form-item>
+
+        <a-form-item class="mt-30" label="排行榜" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-radio-group v-decorator="['ranking_list', { rules: [{ required: true }] }]">
+            <a-radio :value="true">开启</a-radio>
+            <a-radio :value="false">关闭</a-radio>
+          </a-radio-group>
+          <div class="form-item-help">
+            <small>注：如关闭，用户则无法通过微信小程序端访问排行榜</small>
+          </div>
+        </a-form-item>
 
+        <a-form-item class="mt-30" label="服务" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-radio-group v-decorator="['service', { rules: [{ required: true }] }]">
+            <a-radio :value="true">开启</a-radio>
+            <a-radio :value="false">关闭</a-radio>
+          </a-radio-group>
+          <div class="form-item-help">
+            <small>注：如关闭，用户则无法通过微信小程序端访问服务</small>
+          </div>
+        </a-form-item>
         <a-divider orientation="left">授权域名设置</a-divider>
         <a-form-item
           v-for="(item, index) in domainList"
@@ -41,11 +94,9 @@
           required
         >
           <span class="f-14">{{ `${item.protocol}://${domain}` }}</span>
-          <a
+          <a class="ml-15 f-12" href="javascript:void(0);" @click="handleCopyLink(`${item.protocol}://${domain}`)"
-            class="ml-15 f-12"
+            >点击复制</a
-            href="javascript:void(0);"
+          >
-            @click="handleCopyLink(`${item.protocol}://${domain}`)"
-          >点击复制</a>
           <p class="form-item-help">
             <small>登录小程序平台，开发 - 开发管理 - 开发设置 - 服务器域名，修改{{ item.protocol }}协议业务域名</small>
           </p>
@@ -68,19 +119,19 @@ import * as Api from '@/api/client/wxapp/setting'
 const domainList = [
   {
     name: 'request',
-    protocol: 'https'
+    protocol: 'https',
   },
   {
     name: 'socket',
-    protocol: 'wss'
+    protocol: 'wss',
   },
   {
     name: 'uploadFile',
-    protocol: 'https'
+    protocol: 'https',
   },
   {
     name: 'downloadFile',
-    protocol: 'https'
+    protocol: 'https',
   },
 ]
 
@@ -111,32 +162,44 @@ export default {
     this.getDetail()
   },
   methods: {
-
     // 获取当前详情记录
     getDetail() {
       this.isLoading = true
       Api.detail(this.key)
-        .then(result => {
+        .then((result) => {
           // 当前记录
           this.record = result.data.detail
           this.domain = result.data.domain
           // 设置默认值
           this.setFieldsValue()
         })
-        .finally(() => this.isLoading = false)
+        .finally(() => (this.isLoading = false))
     },
 
     // 设置默认值
     setFieldsValue() {
       const { record, $nextTick, form } = this
-      !isEmpty(form.getFieldsValue()) && $nextTick(() => {
+      !isEmpty(form.getFieldsValue()) &&
-        form.setFieldsValue(pick(record, ['enabled', 'app_id', 'app_secret']))
+        $nextTick(() => {
+          form.setFieldsValue(
+            pick(record, [
+              'enabled',
+              'app_id',
+              'app_secret',
+              'same_city',
+              'new_first_gift',
+              'big_brand',
+              'new_product',
+              'ranking_list',
+              'service',
+            ])
+          )
         })
     },
 
     // 复制链接地址
     handleCopyLink(url) {
-      this.$copyText(url).then(res => {
+      this.$copyText(url).then((res) => {
         this.$message.success('复制成功', 0.8)
       })
     },
@@ -145,7 +208,9 @@ export default {
     handleSubmit(e) {
       e.preventDefault()
       // 表单验证
-      const { form: { validateFields } } = this
+      const {
+        form: { validateFields },
+      } = this
       validateFields((errors, values) => {
         // 提交到后端api
         !errors && this.onFormSubmit(values)
@@ -156,11 +221,10 @@ export default {
     onFormSubmit(values) {
       this.isLoading = true
       Api.update(this.key, { form: values })
-        .then(result => this.$message.success(result.message, 1.5))
+        .then((result) => this.$message.success(result.message, 1.5))
-        .finally(() => this.isLoading = false)
+        .finally(() => (this.isLoading = false))
-    }
+    },
-
+  },
-  }
 }
 </script>
 <style lang="less" scoped>

src/views/recovery/order/Index.vue

@@ -51,6 +51,13 @@
         <a v-if="item.order_status == 10" v-action:edit style="margin-right: 8px" @click="handleAcceptance(item)"
           >验收</a
         >
+        <a
+          v-if="item.order_status == 10 || item.order_status == 30"
+          v-action:edit
+          style="margin-right: 8px"
+          @click="handleDelete(item.order_id)"
+          >删除</a
+        >
       </span>
     </a-table>
     <a-pagination
@@ -109,9 +116,14 @@ const columns = [
   },
   {
     title: '期待价格',
-    width: '180px',
+    width: '100px',
     dataIndex: 'expect_price',
   },
+  {
+    title: '实际回收价',
+    width: '100px',
+    dataIndex: 'real_price',
+  },
   {
     title: '添加时间',
     width: '180px',
@@ -241,6 +253,22 @@ export default {
         },
       })
     },
+    // 删除记录
+    handleDelete(order_id) {
+      const self = this
+      const modal = this.$confirm({
+        title: '您确定要删除该记录吗?',
+        content: '删除后不可恢复',
+        onOk() {
+          return Api.orderDel({ order_id })
+            .then((result) => {
+              self.$message.success(result.message, 1.5)
+              self.handleRefresh()
+            })
+            .finally(() => modal.destroy())
+        },
+      })
+    },
     //获取订单状态
     getOrderStatusList() {
       this.isLoading = true

src/views/server/Order.vue

@@ -58,6 +58,13 @@
         <a v-if="item.order_status == 20" v-action:edit style="margin-right: 8px" @click="handleDispatch(item.order_id)"
           >派单</a
         >
+        <a
+          v-if="item.order_status == 10 || item.order_status == 50"
+          v-action:edit
+          style="margin-right: 8px"
+          @click="handleDelete(item.order_id)"
+          >删除</a
+        >
         <a
           v-if="item.order_status == 10 || item.order_status == 20"
           style="margin-right: 8px"
@@ -267,6 +274,22 @@ export default {
     handleDispatch(order_id) {
       this.$refs.dispatchRef.add(order_id)
     },
+    // 删除记录
+    handleDelete(order_id) {
+      const self = this
+      const modal = this.$confirm({
+        title: '您确定要删除该记录吗?',
+        content: '删除后不可恢复',
+        onOk() {
+          return Api.delOrder({ order_id })
+            .then((result) => {
+              self.$message.success(result.message, 1.5)
+              self.handleRefresh()
+            })
+            .finally(() => modal.destroy())
+        },
+      })
+    },
     /**
      * 刷新列表
      * @param Boolean bool 强制刷新到第一页