v1.0

src/pages/order/orderList/components/tableFrom.vue

@@ -78,6 +78,8 @@
               placeholder="全部"
             >
               <Option value="0">普通订单</Option>
+              <!-- <Option value="901">抢购订单</Option> -->
+              <!-- <Option value="902">报单订单</Option> -->
               <Option value="1">秒杀订单</Option>
               <Option value="2">砍价订单</Option>
               <Option value="3">拼团订单</Option>

src/pages/product/productAdd/index.vue

@@ -653,6 +653,13 @@
 					      class="priceBox"
 					  ></InputNumber>
 					</template>
+					<template slot-scope="{ row, index }" slot="award_price">
+					  <InputNumber
+					      v-model="oneFormBatch[0].award_price"
+					      :min="0"
+					      class="priceBox"
+					  ></InputNumber>
+					</template>
                     <template slot-scope="{ row, index }" slot="cost">
                       <InputNumber
                           v-model="oneFormBatch[0].cost"
@@ -767,6 +774,13 @@
 					      class="priceBox"
 					  ></InputNumber>
 					</template>
+					<template slot-scope="{ row, index }" slot="award_price">
+					  <InputNumber
+					      v-model="manyFormValidate[index].award_price"
+					      :min="0"
+					      class="priceBox"
+					  ></InputNumber>
+					</template>
                     <template slot-scope="{ row, index }" slot="cost">
                       <InputNumber
                           v-model="manyFormValidate[index].cost"
@@ -919,6 +933,17 @@
                 ></InputNumber>
               </FormItem>
             </Col>
+			<Col span="24" class="asterisk">
+			  <div class="asteriskInfo on">*</div>
+			  <FormItem label="奖金结算：">
+			    <InputNumber
+			        v-model="oneFormValidate[0].award_price"
+			        :min="0"
+			        :max="99999999"
+			        v-width="'50%'"
+			    ></InputNumber>
+			  </FormItem>
+			</Col>
             <Col span="24" class="asterisk">
               <div class="asteriskInfo on">*</div>
               <FormItem label="成本价：">
@@ -2113,6 +2138,7 @@ export default {
           pic: "",
           price: 0,
 		  settle_price: 0,
+		  award_price:0,
           cost: 0,
           ot_price: 0,
           stock: 0,
@@ -2155,6 +2181,12 @@ export default {
           align: "center",
           minWidth: 95,
         },
+		{
+		  title: "奖金结算",
+		  slot: "award_price",
+		  align: "center",
+		  minWidth: 95,
+		},
         {
           title: "原价",
           slot: "ot_price",
@@ -2299,6 +2331,7 @@ export default {
           pic: "",
           price: 0,
 		  settle_price: 0,
+		  award_price:0,
           cost: 0,
           ot_price: 0,
           stock: 0,
@@ -2609,6 +2642,7 @@ export default {
                     pic: data.slider_image[0],
                     price: 0,
 					settle_price: 0,
+					award_price:0,
                     cost: 0,
                     ot_price: 0,
                     stock: 0,
@@ -2879,6 +2913,7 @@ export default {
       j.pic = '';
       j.price = 0;
 	  j.settle_price = 0;
+	  j.award_price = 0;
       j.cost = 0;
       j.ot_price = 0;
       j.stock = 0;
@@ -3219,6 +3254,7 @@ export default {
             pic: "",
             price: 0,
 			settle_price: 0,
+			award_price:0,
             cost: 0,
             ot_price: 0,
             stock: 0,
@@ -3476,6 +3512,7 @@ export default {
           pic: "",
           price: 0,
 		  settle_price: 0,
+		  award_price:0,
           cost: 0,
           ot_price: 0,
           stock: 0,
@@ -3547,6 +3584,9 @@ export default {
 		  if (this.oneFormBatch[0].settle_price > 0 && this.merchantType == 2) {
 		    this.$set(val, "settle_price", this.oneFormBatch[0].settle_price);
 		  }
+		  if (this.oneFormBatch[0].award_price > 0 ) {
+		    this.$set(val, "award_price", this.oneFormBatch[0].award_price);
+		  }
           if (this.oneFormBatch[0].cost > 0) {
             this.$set(val, "cost", this.oneFormBatch[0].cost);
           }

src/pages/statistic/order/index.vue

@@ -1,485 +1,625 @@
 <template>
-  <div>
+	<div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+		<Card :bordered="false" dis-hover class="ivu-mt">
-      <Form ref="formInline"
+			<Form ref="formInline" :label-width="labelWidth" :label-position="labelPosition" inline>
-        :label-width="labelWidth"
+				<FormItem label="选择时间：">
-        :label-position="labelPosition"
+					<DatePicker :editable="false" :clearable="false" @on-change="onchangeTime" :value="timeVal"
-        inline>
+						format="yyyy/MM/dd" type="datetimerange" placement="bottom-start" placeholder="请选择时间"
-        <FormItem label="选择时间：">
+						style="width: 200px" :options="options" class="mr20"></DatePicker>
-          <DatePicker
+				</FormItem>
-            :editable="false"
+				<!-- <FormItem label="运营中心：">
-            :clearable="false"
+					<Select v-model="formValidate.area_admin" @on-change='changearea'>
-            @on-change="onchangeTime"
+						<Option :value="0">无</Option>
-            :value="timeVal"
+						<Option :value="3">省</Option>
-            format="yyyy/MM/dd"
+						<Option :value="2">市</Option>
-            type="datetimerange"
+						<Option :value="1">区</Option>
-            placement="bottom-start"
+					</Select>
-            placeholder="请选择时间"
+				</FormItem> -->
-            style="width: 200px"
+				<FormItem label="管理区域：">
-            :options="options"
+					<Cascader v-model="addressSelectDl" :data="addresData2" :load-data="loadData2"
-            class="mr20"
+						@on-change="addchack2"></Cascader>
-          ></DatePicker>
+				</FormItem>
-        </FormItem>
+				<FormItem>
-      </Form>
+					<Button
-    </Card>
+					    type="primary"
-    <cards-data
+					    label="default"
-      :cardLists="cardLists"
+					    class="mr15"
-      v-if="cardLists.length >= 0"
+					    @click="getBasic()"
-    ></cards-data>
+					>搜索</Button>
-    <Card :bordered="false" dis-hover>
+				</FormItem>
-      <h3>营业趋势</h3>
+			</Form>
-      <echarts-new
+		</Card>
-        :option-data="optionData"
+
-        :styles="style"
+		<cards-data :cardLists="cardLists" v-if="cardLists.length >= 0"></cards-data>
-        height="100%"
+		<Card :bordered="false" dis-hover>
-        width="100%"
+			<h3>营业趋势</h3>
-        v-if="optionData"
+			<echarts-new :option-data="optionData" :styles="style" height="100%" width="100%"
-      ></echarts-new>
+				v-if="optionData"></echarts-new>
-    </Card>
+		</Card>
-    <Spin size="large" fix v-if="spinShow"></Spin>
+		<Spin size="large" fix v-if="spinShow"></Spin>
-    <div class="code-row-bg">
+		<div class="code-row-bg">
-      <Card :bordered="false" dis-hover class="ivu-mt">
+			<Card :bordered="false" dis-hover class="ivu-mt">
-        <div class="acea-row row-between-wrapper">
+				<div class="acea-row row-between-wrapper">
-          <h3 class="header-title">订单来源分析</h3>
+					<h3 class="header-title">订单来源分析</h3>
-          <div class="change-style" @click="echartLeft = !echartLeft">
+					<div class="change-style" @click="echartLeft = !echartLeft">
-            切换样式
+						切换样式
-          </div>
+					</div>
-        </div>
+				</div>
-        <div class="ech-box">
+				<div class="ech-box">
-          <echarts-from
+					<echarts-from v-if="echartLeft" ref="visitChart" :infoList="infoList"
-            v-if="echartLeft"
+						echartsTitle="circle"></echarts-from>
-            ref="visitChart"
+					<Table v-show="!echartLeft" ref="selection" :columns="columns1" :data="tabList" :loading="loading"
-            :infoList="infoList"
+						no-data-text="暂无数据" highlight-row no-filtered-data-text="暂无筛选结果">
-            echartsTitle="circle"
+						<template slot-scope="{ row }" slot="percent">
-          ></echarts-from>
+							<div class="percent-box">
-          <Table
+								<div class="line">
-            v-show="!echartLeft"
+									<div class="bg"></div>
-            ref="selection"
+									<div class="percent" :style="'width:' + row.percent + '%;'"></div>
-            :columns="columns1"
+								</div>
-            :data="tabList"
+								<div class="num">{{ row.percent }}%</div>
-            :loading="loading"
+							</div>
-            no-data-text="暂无数据"
+						</template>
-            highlight-row
+					</Table>
-            no-filtered-data-text="暂无筛选结果"
+				</div>
-          >
+			</Card>
-            <template slot-scope="{ row }" slot="percent">
+			<Card :bordered="false" dis-hover class="ivu-mt">
-              <div class="percent-box">
+				<div class="acea-row row-between-wrapper">
-                <div class="line">
+					<h3 class="header-title">订单类型分析</h3>
-                  <div class="bg"></div>
+					<div class="change-style" @click="echartRight = !echartRight">
-                  <div
+						切换样式
-                    class="percent"
+					</div>
-                    :style="'width:' + row.percent + '%;'"
+				</div>
-                  ></div>
+				<div class="ech-box" style="max-height:350px;overflow:auto;">
-                </div>
+					<echarts-from v-if="echartRight" ref="visitChart" :infoList="infoList2"
-                <div class="num">{{ row.percent }}%</div>
+						echartsTitle="circle"></echarts-from>
-              </div>
+					<Table v-show="!echartRight" ref="selection" :columns="columns" :data="tabList2" :loading="loading2"
-            </template>
+						no-data-text="暂无数据" highlight-row no-filtered-data-text="暂无筛选结果">
-          </Table>
+						<template slot-scope="{ row }" slot="percent">
-        </div>
+							<div class="percent-box">
-      </Card>
+								<div class="line">
-      <Card :bordered="false" dis-hover class="ivu-mt">
+									<div class="bg"></div>
-        <div class="acea-row row-between-wrapper">
+									<div class="percent" :style="'width:' + row.percent + '%;'"></div>
-          <h3 class="header-title">订单类型分析</h3>
+								</div>
-          <div class="change-style" @click="echartRight = !echartRight">
+								<div class="num">{{ row.percent }}%</div>
-            切换样式
+							</div>
-          </div>
+						</template>
-        </div>
+					</Table>
-        <div class="ech-box" style="max-height:350px;overflow:auto;">
+				</div>
-          <echarts-from
+			</Card>
-            v-if="echartRight"
+		</div>
-            ref="visitChart"
+	</div>
-            :infoList="infoList2"
-            echartsTitle="circle"
-          ></echarts-from>
-          <Table
-            v-show="!echartRight"
-            ref="selection"
-            :columns="columns"
-            :data="tabList2"
-            :loading="loading2"
-            no-data-text="暂无数据"
-            highlight-row
-            no-filtered-data-text="暂无筛选结果"
-          >
-            <template slot-scope="{ row }" slot="percent">
-              <div class="percent-box">
-                <div class="line">
-                  <div class="bg"></div>
-                  <div
-                    class="percent"
-                    :style="'width:' + row.percent + '%;'"
-                  ></div>
-                </div>
-                <div class="num">{{ row.percent }}%</div>
-              </div>
-            </template>
-          </Table>
-        </div>
-      </Card>
-    </div>
-  </div>
 </template>
 
 <script>
-import cardsData from '@/components/cards/cards';
+	import cardsData from '@/components/cards/cards';
-import echartsNew from '@/components/echartsNew/index';
+	import echartsNew from '@/components/echartsNew/index';
-import { getBasic, getTrend, getChannel, getType } from '@/api/statistic';
+	import {
-import { formatDate } from '@/utils/validate';
+		getBasic,
-import echartsFrom from '@/components/echarts/index';
+		getTrend,
-import timeOptions from '@/utils/timeOptions';
+		getChannel,
-import { mapState } from "vuex";
+		getType
-
+	} from '@/api/statistic';
-export default {
+	import {
-  name: 'index',
+		formatDate
-  components: { cardsData, echartsNew, echartsFrom },
+	} from '@/utils/validate';
-  data() {
+	import echartsFrom from '@/components/echarts/index';
-    return {
+	import timeOptions from '@/utils/timeOptions';
-      timeVal: [],
+	import {
-      style: { height: '400px' },
+		mapState
-      infoList: {},
+	} from "vuex";
-      infoList2: {},
+	import {
-      echartLeft: true,
+		cityApi
-      echartRight: false,
+	} from '@/api/store';
-      loading: false,
+	export default {
-      loading2: false,
+		name: 'index',
-      fromList: {
+		components: {
-        title: '选择时间',
+			cardsData,
-        custom: true,
+			echartsNew,
-        fromTxt: [
+			echartsFrom
-          { text: '全部', val: '' },
+		},
-          { text: '今天', val: 'today' },
+		data() {
-          { text: '本周', val: 'week' },
+			return {
-          { text: '本月', val: 'month' },
+				timeVal: [],
-          { text: '本季度', val: 'quarter' },
+				style: {
-          { text: '本年', val: 'year' },
+					height: '400px'
-        ],
+				},
-      },
+				infoList: {},
-      formValidate: {
+				infoList2: {},
-        time: '',
+				echartLeft: true,
-      },
+				echartRight: false,
-      cardLists: [
+				loading: false,
-        {
+				loading2: false,
-          col: 4,
+				fromList: {
-          count: 0,
+					title: '选择时间',
-          name: '支付订单数',
+					custom: true,
-          className: 'md-rose',
+					fromTxt: [{
-        },
+							text: '全部',
-        {
+							val: ''
-          col: 4,
+						},
-          count: 0,
+						{
-          name: '实付金额',
+							text: '今天',
-          className: 'ios-speedometer-outline',
+							val: 'today'
-        },
+						},
-        {
+						{
-          col: 4,
+							text: '本周',
-          count: 0,
+							val: 'week'
-          name: '退款订单量',
+						},
-          className: 'ios-speedometer-outline',
+						{
-        },
+							text: '本月',
-        {
+							val: 'month'
-          col: 4,
+						},
-          count: 0,
+						{
-          name: '退款金额',
+							text: '本季度',
-          className: 'md-rose',
+							val: 'quarter'
-        },
+						},
-        {
+						{
-          col: 4,
+							text: '本年',
-          count: 0,
+							val: 'year'
-          name: '用券金额',
+						},
-          className: 'md-ribbon',
+					],
-        },
+				},
-        {
+				formValidate: {
-          col: 4,
+					time: '',
-          count: 0,
+					area_admin: "1",
-          name: '用券数量',
+					order_province: 0,
-          className: 'md-ribbon',
+					order_city: 0,
-        },
+					order_district: 0,
-      ],
+				},
-      optionData: {},
+				cardLists: [{
-      spinShow: false,
+						col: 4,
-      options: timeOptions,
+						count: 0,
-      columns: [
+						name: '支付订单数',
-        {
+						className: 'md-rose',
-          title: '序号',
+					},
-          type: 'index',
+					{
-          width: 60,
+						col: 4,
-          align: 'center',
+						count: 0,
-        },
+						name: '实付金额',
-        {
+						className: 'ios-speedometer-outline',
-          title: '来源',
+					},
-          key: 'name',
+					{
-          minWidth: 80,
+						col: 4,
-          align: 'center',
+						count: 0,
-        },
+						name: '退款订单量',
-        {
+						className: 'ios-speedometer-outline',
-          title: '金额',
+					},
-          width: 180,
+					{
-          key: 'value',
+						col: 4,
-          align: 'center',
+						count: 0,
-        },
+						name: '退款金额',
-        {
+						className: 'md-rose',
-          title: '占比率',
+					},
-          slot: 'percent',
+					{
-          minWidth: 100,
+						col: 4,
-          align: 'center',
+						count: 0,
-        },
+						name: '用券金额',
-      ],
+						className: 'md-ribbon',
-	  columns1:[],
+					},
-      tabList: [],
+					{
-      tabList2: [],
+						col: 4,
-    };
+						count: 0,
-  },
+						name: '用券数量',
-  computed:{
+						className: 'md-ribbon',
-     ...mapState("admin/layout", ["isMobile"]),
+					},
-    labelWidth() {
+					{
-      return this.isMobile ? undefined : 96;
+						col: 4,
-    },
+						count: 0,
-    labelPosition() {
+						name: '支付宝支付',
-      return this.isMobile ? "top" : "right";
+						className: 'ios-at',
-    },
+					},
-  },
+					{
-  created() {
+						col: 4,
-	  let obj = {
+						count: 0,
-		  title: '订单量',
+						name: '微信支付',
-		  width: 180,
+						className: 'ios-chatboxes-outline',
-		  key: 'value',
+					},
-		  align: 'center',
+					{
-	  }
+						col: 4,
-	let columns = JSON.parse(JSON.stringify(this.columns));
+						count: 0,
-	columns.splice(2,1,obj);
+						name: '余额支付',
-	this.columns1 = columns;
+						className: 'logo-yen',
-    // this.getTrend();
+					},
-    const end = new Date();
+					{
-    const start = new Date();
+						col: 4,
-    start.setTime(
+						count: 0,
-      start.setTime(
+						name: '使用消费分',
-        new Date(
+						className: 'logo-vimeo',
-          new Date().getFullYear(),
+					},
-          new Date().getMonth(),
+					{
-          new Date().getDate() - 29
+						col: 4,
-        )
+						count: 0,
-      )
+						name: '线下支付',
-    );
+						className: 'ios-woman',
-    this.timeVal = [start, end];
+					},
-    this.formValidate.time =
+					{
-      formatDate(start, 'yyyy/MM/dd') + '-' + formatDate(end, 'yyyy/MM/dd');
+						col: 4,
-    this.onInit();
+						count: 0,
-  },
+						name: '报单金额',
-  methods: {
+						className: 'ios-thumbs-up',
-    onInit() {
+					},
-      this.getBasic();
+				],
-      this.getTrend();
+				optionData: {},
-      this.getChannel();
+				spinShow: false,
-      this.getType();
+				options: timeOptions,
-    },
+				columns: [{
-    onSelectDate(e) {
+						title: '序号',
-      this.formValidate.time = e;
+						type: 'index',
-      this.onInit();
+						width: 60,
-    },
+						align: 'center',
-    timeG(dd) {
+					},
-      var d = new Date(dd);
+					{
-      var datetime =
+						title: '来源',
-        d.getFullYear() +
+						key: 'name',
-        '-' +
+						minWidth: 80,
-        (d.getMonth() + 1) +
+						align: 'center',
-        '-' +
+					},
-        d.getDate() +
+					{
-        ' ' +
+						title: '金额',
-        d.getHours() +
+						width: 180,
-        ':' +
+						key: 'value',
-        d.getMinutes() +
+						align: 'center',
-        ':' +
+					},
-        d.getSeconds();
+					{
-      return datetime;
+						title: '占比率',
-    },
+						slot: 'percent',
-    getBasic() {
+						minWidth: 100,
-      getBasic(this.formValidate).then((res) => {
+						align: 'center',
-        let arr = [
+					},
-          'pay_count',
+				],
-          'pay_price',
+				columns1: [],
-          'refund_count',
+				tabList: [],
-          'refund_price',
+				tabList2: [],
-          'coupon_price',
+				// 代理区域
-          'coupon_count',
+				addressSelectDl: [],
-        ];
+				// 三级地质系
-        this.cardLists.map((i, index) => {
+				addresData2: [],
-          i.count = res.data[arr[index]];
+			};
-        });
+		},
-      });
+		computed: {
-    },
+			...mapState("admin/layout", ["isMobile"]),
-    getChannel() {
+			labelWidth() {
-      this.loading = true;
+				return this.isMobile ? undefined : 96;
-      getChannel(this.formValidate).then((res) => {
+			},
-        this.infoList = res.data;
+			labelPosition() {
-        this.tabList = res.data.list;
+				return this.isMobile ? "top" : "right";
-        this.loading = false;
+			},
-      });
+		},
-    },
+		created() {
-    getType() {
+			let obj = {
-      this.loading2 = true;
+				title: '订单量',
-      getType(this.formValidate).then((res) => {
+				width: 180,
-        this.infoList2 = res.data;
+				key: 'value',
-        this.tabList2 = res.data.list;
+				align: 'center',
-        this.loading2 = false;
+			}
-      });
+			let columns = JSON.parse(JSON.stringify(this.columns));
-    },
+			columns.splice(2, 1, obj);
-    selectChange(e) {
+			this.columns1 = columns;
-      console.log(this.timeG(e.split(',')[0]), this.timeG(e.split(',')[1]));
+			// this.getTrend();
-    },
+			const end = new Date();
-    // 具体日期
+			const start = new Date();
-    onchangeTime(e) {
+			start.setTime(
-      this.timeVal = e;
+				start.setTime(
-      this.formValidate.time = this.timeVal[0] ? this.timeVal.join('-') : '';
+					new Date(
-      this.name = this.formValidate.time;
+						new Date().getFullYear(),
-      this.getBasic();
+						new Date().getMonth(),
-      if (this.formValidate.time) {
+						new Date().getDate() - 29
-        this.getTrend();
+					)
-      }
+				)
-      this.getChannel();
+			);
-      this.getType();
+			this.timeVal = [start, end];
-    },
+			this.formValidate.time =
-    // 统计图
+				formatDate(start, 'yyyy/MM/dd') + '-' + formatDate(end, 'yyyy/MM/dd');
-    getTrend() {
+			this.onInit();
-      this.spinShow = true;
+			// 加載省市區
-      getTrend(this.formValidate)
+			this.cityInfo({
-        .then(async (res) => {
+				pid: 0
-          let legend = res.data.series.map((item) => {
+			},"addresData2");
-            return item.name;
+		},
-          });
+		methods: {
-          let xAxis = res.data.xAxis;
+			// 省市区数据
-          let col = ['#5B8FF9', '#5AD8A6', '#FFAB2B', '#5D7092'];
+			cityInfo(data, name) {
-          let series = [];
+				cityApi(data).then(res => {
-          res.data.series.map((item, index) => {
+					this[name] = res.data
-            series.push({
+				})
-              name: item.name,
+			},
-              type: 'line',
+			// 选择运营中心
-              data: item.data,
+			changearea(e, type = 'reload') {
-              itemStyle: {
+				try {
-                normal: {
+					console.log(type);
-                  color: col[index],
+					if (type == 'reload') {
-                },
+						this.addressSelectDl = [];
-              },
+					}
-              smooth: 0,
+					// if (type == 'init') {
-            });
+					// 	this.addressSelectDl = this.psInfo.area_provincials.split('/').map((re) => {
-          });
+					// 		return +re
-          this.optionData = {
+					// 	});
-            tooltip: {
+					// }
-              trigger: 'axis',
+					console.log(type);
-              axisPointer: {
+					if (e == 3) {
-                type: 'cross',
+						this.cityInfo({
-                label: {
+							pid: 0,
-                  backgroundColor: '#6a7985',
+							type: 4
-                },
+						}, "addresData2")
-              },
+					} else
-            },
+					if (e == 2) {
-            legend: {
+						this.cityInfo({
-              x: 'center',
+							pid: 0,
-              data: legend,
+							type: 1
-            },
+						}, "addresData2")
-            grid: {
+					} else
-              left: '3%',
+					if (e == 1) {
-              right: '4%',
+						this.cityInfo({
-              bottom: '3%',
+							pid: 0,
-              containLabel: true,
+							type: 2
-            },
+						}, "addresData2")
-            toolbox: {
+					}
-              feature: {
+				} catch (e) {
-                saveAsImage: {},
+					console.log(e);
-              },
+					//TODO handle the exception
-              right: '5%'
+				}
-            },
+			},
-            xAxis: {
+			getCityData(item, callback, type = 0) {
-              type: 'category',
+				item.loading = true;
-              boundaryGap: true,
+				cityApi({
-              axisLabel: {
+					pid: item.value,
-                interval: 0,
+					type
-                rotate: 40,
+				}).then(res => {
-                textStyle: {
+					item.children = res.data;
-                  color: '#000000',
+					item.loading = false;
-                },
+					callback();
-              },
+				});
-              data: xAxis,
+			},
-            },
+			// 代理省市区选择
-            yAxis: {
+			loadData2(item, callback) {
-              type: 'value',
+				console.log(item,)
-              axisLine: {
+				if (this.formValidate.area_admin == "2") {
-                show: false,
+					this.getCityData(item, callback, 1)
-              },
+				} else if (this.formValidate.area_admin == "1") {
-              axisTick: {
+					this.getCityData(item, callback, 2)
-                show: false,
+				}
-              },
+			},
-              axisLabel: {
+			// 選中地址
-                textStyle: {
+			addchack2(e, selectedData) {
-                  color: '#7F8B9C',
+				e.forEach((i, index) => {
-                },
+					if (index == 0) {
-              },
+						this.formValidate.order_province = selectedData[index].label
-              splitLine: {
+					} else if (index == 1) {
-                show: true,
+						this.formValidate.order_city = selectedData[index].label
-                lineStyle: {
+					} else if (index == 2) {
-                  color: '#F5F7F9',
+						this.formValidate.order_district = selectedData[index].label
-                },
+					}
-              },
+				})
-            },
+				this.formValidate.area_provincials = (selectedData.map(o => o.id)).join("/");
-            series: series,
+			},
-          };
+			onInit() {
-          this.spinShow = false;
+				this.getBasic();
-        })
+				this.getTrend();
-        .catch((res) => {
+				this.getChannel();
-          this.$Message.error(res.msg);
+				this.getType();
-          this.spinShow = false;
+			},
-        });
+			onSelectDate(e) {
-    },
+				this.formValidate.time = e;
-  },
+				this.onInit();
-};
+			},
+			timeG(dd) {
+				var d = new Date(dd);
+				var datetime =
+					d.getFullYear() +
+					'-' +
+					(d.getMonth() + 1) +
+					'-' +
+					d.getDate() +
+					' ' +
+					d.getHours() +
+					':' +
+					d.getMinutes() +
+					':' +
+					d.getSeconds();
+				return datetime;
+			},
+			getBasic() {
+				getBasic(this.formValidate).then((res) => {
+					let arr = [
+						'pay_count',
+						'pay_price',
+						'refund_count',
+						'refund_price',
+						'coupon_price',
+						'coupon_count',
+						'ali_pay_price',
+						'wechat_pay_price',
+						'yue_pay_price',
+						'integral_pay_price',
+						'offline_pay_price',
+						'award_price',
+					];
+					this.cardLists.map((i, index) => {
+						i.count = res.data[arr[index]];
+					});
+				});
+			},
+			getChannel() {
+				this.loading = true;
+				getChannel(this.formValidate).then((res) => {
+					this.infoList = res.data;
+					this.tabList = res.data.list;
+					this.loading = false;
+				});
+			},
+			getType() {
+				this.loading2 = true;
+				getType(this.formValidate).then((res) => {
+					this.infoList2 = res.data;
+					this.tabList2 = res.data.list;
+					this.loading2 = false;
+				});
+			},
+			selectChange(e) {
+				console.log(this.timeG(e.split(',')[0]), this.timeG(e.split(',')[1]));
+			},
+			// 具体日期
+			onchangeTime(e) {
+				this.timeVal = e;
+				this.formValidate.time = this.timeVal[0] ? this.timeVal.join('-') : '';
+				this.name = this.formValidate.time;
+				this.getBasic();
+				if (this.formValidate.time) {
+					this.getTrend();
+				}
+				this.getChannel();
+				this.getType();
+			},
+			// 统计图
+			getTrend() {
+				this.spinShow = true;
+				getTrend(this.formValidate)
+					.then(async (res) => {
+						let legend = res.data.series.map((item) => {
+							return item.name;
+						});
+						let xAxis = res.data.xAxis;
+						let col = ['#5B8FF9', '#5AD8A6', '#FFAB2B', '#5D7092'];
+						let series = [];
+						res.data.series.map((item, index) => {
+							series.push({
+								name: item.name,
+								type: 'line',
+								data: item.data,
+								itemStyle: {
+									normal: {
+										color: col[index],
+									},
+								},
+								smooth: 0,
+							});
+						});
+						this.optionData = {
+							tooltip: {
+								trigger: 'axis',
+								axisPointer: {
+									type: 'cross',
+									label: {
+										backgroundColor: '#6a7985',
+									},
+								},
+							},
+							legend: {
+								x: 'center',
+								data: legend,
+							},
+							grid: {
+								left: '3%',
+								right: '4%',
+								bottom: '3%',
+								containLabel: true,
+							},
+							toolbox: {
+								feature: {
+									saveAsImage: {},
+								},
+								right: '5%'
+							},
+							xAxis: {
+								type: 'category',
+								boundaryGap: true,
+								axisLabel: {
+									interval: 0,
+									rotate: 40,
+									textStyle: {
+										color: '#000000',
+									},
+								},
+								data: xAxis,
+							},
+							yAxis: {
+								type: 'value',
+								axisLine: {
+									show: false,
+								},
+								axisTick: {
+									show: false,
+								},
+								axisLabel: {
+									textStyle: {
+										color: '#7F8B9C',
+									},
+								},
+								splitLine: {
+									show: true,
+									lineStyle: {
+										color: '#F5F7F9',
+									},
+								},
+							},
+							series: series,
+						};
+						this.spinShow = false;
+					})
+					.catch((res) => {
+						this.$Message.error(res.msg);
+						this.spinShow = false;
+					});
+			},
+		},
+	};
 </script>
 
 <style scoped>
-.cl {
+	.cl {
-  margin-right: 20px;
+		margin-right: 20px;
-}
+	}
-.code-row-bg {
+
-  display: flex;
+	.code-row-bg {
-  flex-wrap: nowrap;
+		display: flex;
-}
+		flex-wrap: nowrap;
-.code-row-bg .ivu-mt {
+	}
-  width: 100%;
+
-  margin: 0 5px;
+	.code-row-bg .ivu-mt {
-}
+		width: 100%;
-.ech-box {
+		margin: 0 5px;
-  margin-top: 10px;
+	}
-}
+
-.change-style {
+	.ech-box {
-  border: 1px solid #ccc;
+		margin-top: 10px;
-  border-radius: 15px;
+	}
-  padding: 0px 10px;
+
-  cursor: pointer;
+	.change-style {
-}
+		border: 1px solid #ccc;
-.percent-box {
+		border-radius: 15px;
-  display: flex;
+		padding: 0px 10px;
-  align-items: center;
+		cursor: pointer;
-  padding-right: 10px;
+	}
-}
+
-.line {
+	.percent-box {
-  flex: 1;
+		display: flex;
-  position: relative;
+		align-items: center;
-}
+		padding-right: 10px;
-.bg {
+	}
-  position: absolute;
+
-  width: 100%;
+	.line {
-  height: 8px;
+		flex: 1;
-  border-radius: 8px;
+		position: relative;
-  background-color: #f2f2f2;
+	}
-}
+
-.percent {
+	.bg {
-  position: absolute;
+		position: absolute;
-  border-radius: 5px;
+		width: 100%;
-  height: 8px;
+		height: 8px;
-  background-color: cornflowerblue;
+		border-radius: 8px;
-  z-index: 9999;
+		background-color: #f2f2f2;
-}
+	}
-.num {
+
-  white-space: nowrap;
+	.percent {
-  margin: 0 0 0 10px;
+		position: absolute;
-  width: 50px;
+		border-radius: 5px;
-}
+		height: 8px;
-</style>
+		background-color: cornflowerblue;
+		z-index: 9999;
+	}
+
+	.num {
+		white-space: nowrap;
+		margin: 0 0 0 10px;
+		width: 50px;
+	}
+</style>

src/pages/supplier/supplier-supplier_list/index.vue

@@ -47,7 +47,9 @@
             <span slot="close">关闭</span>
           </i-switch>
         </template>
-
+		<template slot-scope="{ row, index }" slot="valid_time">
+			{{row.valid_time|formatDate}}
+		</template>
         <!-- 操作 -->
         <template slot-scope="{ row, index }" slot="action">
           <a @click="goSupplier(row)">进入</a>
@@ -83,10 +85,19 @@ import util from '@/libs/util'
 import Setting from '@/setting'
 import { supplierList, putSupplierStatus, supplierLogin } from '@/api/supplier'
 import Template from '../../setting/devise/template.vue'
+import {formatDate} from "../../../utils/validate.js"
 export default {
   name: '',
   components: { Template },
   props: {},
+  filters: {
+      formatDate(time) {
+          if (time !== 0) {
+              let date = new Date(time * 1000)
+              return formatDate(date, 'yyyy-MM-dd hh:mm')
+          }
+      }
+  },
   data() {
     return {
       roterPre: Setting.roterPre,
@@ -135,8 +146,13 @@ export default {
         {
           title: '创建时间',
           key: '_add_time',
-          minWidth: 100,
+          minWidth: 130,
         },
+		{
+		  title: '有效时间',
+		  slot: 'valid_time',
+		  minWidth: 130,
+		},
         {
           title: '备注',
           key: 'mark',

src/pages/supplier/supplierAdd/index.vue

@@ -1,371 +1,331 @@
 <template>
-<!-- 添加供应商 -->
+	<!-- 添加供应商 -->
-  <div class="article-manager video-icon form-submit" id="shopp-manager">
+	<div class="article-manager video-icon form-submit" id="shopp-manager">
-    <div class="i-layout-page-header">
+		<div class="i-layout-page-header">
-      <PageHeader class="product_tabs" hidden-breadcrumb>
+			<PageHeader class="product_tabs" hidden-breadcrumb>
-        <div slot="title" class="acea-row row-middle">
+				<div slot="title" class="acea-row row-middle">
-          <router-link :to="{ path: `${roterPre}/supplier/menu/list` }">
+					<router-link :to="{ path: `${roterPre}/supplier/menu/list` }">
-            <div class="font-sm after-line">
+						<div class="font-sm after-line">
-              <span class="iconfont iconfanhui"></span>
+							<span class="iconfont iconfanhui"></span>
-              <span class="pl10">返回</span>
+							<span class="pl10">返回</span>
-            </div>
+						</div>
-          </router-link>
+					</router-link>
-          <span
+					<span v-text="$route.params.id ? '编辑供应商' : '添加供应商'" class="mr20 ml16"></span>
-            v-text="$route.params.id ? '编辑供应商' : '添加供应商'"
+				</div>
-            class="mr20 ml16"
+			</PageHeader>
-          ></span>
+		</div>
-        </div>
+		<Card :bordered="false" dis-hover class="ivu-mt">
-      </PageHeader>
+			<Form class="formValidate mt20" ref="formValidate" :rules="ruleValidate" :model="formValidate"
-    </div>
+				:label-width="width" :label-position="labelPosition" @submit.native.prevent>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+				<Row :gutter="24" type="flex">
-      <Form
+					<Col span="24">
-        class="formValidate mt20"
+					<FormItem label="供应商名称：" prop="supplier_name">
-        ref="formValidate"
+						<Input v-model="formValidate.supplier_name" placeholder="请输入供应商名称" v-width="460" />
-        :rules="ruleValidate"
+					</FormItem>
-        :model="formValidate"
+					</Col>
-        :label-width="width"
-        :label-position="labelPosition"
-        @submit.native.prevent
-      >
-        <Row :gutter="24" type="flex">
-          <Col span="24">
-            <FormItem label="供应商名称：" prop="supplier_name">
-              <Input
-                v-model="formValidate.supplier_name"
-                placeholder="请输入供应商名称"
-             v-width="460"
-              />
-            </FormItem>
-          </Col>
 
-          <!-- <Row :gutter="24" type="flex"> -->
+					<!-- <Row :gutter="24" type="flex"> -->
-          <Col span="24">
+					<Col span="24">
-            <FormItem label="联系人姓名：" prop="name">
+					<FormItem label="联系人姓名：" prop="name">
-              <Input
+						<Input v-model="formValidate.name" placeholder="请输入联系人姓名" v-width="460" />
-                v-model="formValidate.name"
+					</FormItem>
-                placeholder="请输入联系人姓名"
+					</Col>
-          v-width="460"
+					<!-- </Row> -->
-              />
-            </FormItem>
-          </Col>
-          <!-- </Row> -->
 
-          <Col span="24">
+					<Col span="24">
-            <FormItem label="联系电话：" prop="phone">
+					<FormItem label="联系电话：" prop="phone">
-              <Input
+						<Input v-model="formValidate.phone" placeholder="请输入联系电话" v-width="460" />
-                v-model="formValidate.phone"
+					</FormItem>
-                placeholder="请输入联系电话"
+					</Col>
-               v-width="460"
-              />
-            </FormItem>
-          </Col>
 
-      
-          <Col span="24">
-            <FormItem label="省市区地址" prop="addressSelect">
-              <Cascader
-                :data="addresData"
-                :load-data="loadData"
-                v-model="formValidate.addressSelect"
-                @on-change="addchack"
-                v-width="460"
-              ></Cascader>
-            </FormItem>
-          </Col>
-              <Col span="24">
-            <FormItem label="供应商地址：" prop="detailed_address">
-              <Input
-                v-model="formValidate.detailed_address"
-                placeholder="请输入供应商地址"
-             v-width="460"
-              />
-            </FormItem>
-          </Col>
 
-          <Col span="24">
+					<Col span="24">
-            <FormItem label="供应商邮箱：" prop="email">
+					<FormItem label="省市区地址" prop="addressSelect">
-              <Input
+						<Cascader :data="addresData" :load-data="loadData" v-model="formValidate.addressSelect"
-                v-model="formValidate.email"
+							@on-change="addchack" v-width="460"></Cascader>
-                placeholder="请输入供应商邮箱"
+					</FormItem>
-               v-width="460"
+					</Col>
-              />
+					<Col span="24">
-            </FormItem>
+					<FormItem label="供应商地址：" prop="detailed_address">
-          </Col>
+						<Input v-model="formValidate.detailed_address" placeholder="请输入供应商地址" v-width="460" />
-          <Col span="24">
+					</FormItem>
-            <FormItem label="备注：" prop="mark">
+					</Col>
-              <Input
+
-                type="textarea"
+					<Col span="24">
-                v-model="formValidate.mark"
+					<FormItem label="供应商邮箱：" prop="email">
-                placeholder="请输入..."
+						<Input v-model="formValidate.email" placeholder="请输入供应商邮箱" v-width="460" />
-              v-width="460"
+					</FormItem>
-              />
+					</Col>
-            </FormItem>
+					<Col span="24">
-          </Col>
+					<FormItem label="备注：" prop="mark">
-          <Col span="24">
+						<Input type="textarea" v-model="formValidate.mark" placeholder="请输入..." v-width="460" />
-            <FormItem label="供应商登录用户名：" prop="account">
+					</FormItem>
-              <Input
+					</Col>
-                v-model="formValidate.account"
+					<Col span="24">
-                placeholder="请输入登录名称"
+					<FormItem label="供应商登录用户名：" prop="account">
-               v-width="460"
+						<Input v-model="formValidate.account" placeholder="请输入登录名称" v-width="460" />
-              />
+					</FormItem>
-            </FormItem>
+					</Col>
-          </Col>
+					<Col span="24">
-          <Col span="24">
+					<FormItem label="供应商登录密码 ：" prop="pwd">
-            <FormItem label="供应商登录密码 ：" prop="pwd">
+						<Input v-model="formValidate.pwd" placeholder="请输入登录密码" v-width="460" />
-              <Input
+					</FormItem>
-                v-model="formValidate.pwd"
+					</Col>
-                placeholder="请输入登录密码"
+					<Col span="24">
-              v-width="460"
+					<FormItem label="确认登录密码 ：" prop="conf_pwd">
-              />
+						<Input v-model="formValidate.conf_pwd" placeholder="请确认登录密码" v-width="460" />
-            </FormItem>
+					</FormItem>
-          </Col>
+					</Col>
-          <Col span="24">
+					<Col span="24">
-            <FormItem label="确认登录密码 ：" prop="conf_pwd">
+					<FormItem label="排序：">
-              <Input
+						<InputNumber v-width="460" :min="0" :max="999999" v-model="formValidate.sort"
-                v-model="formValidate.conf_pwd"
+							placeholder="请输入排序" />
-                placeholder="请确认登录密码"
+					</FormItem>
-            v-width="460"
+					</Col>
-              />
+					<Col span="24">
-            </FormItem>
+					<FormItem label="有效期：" prop="valid_time">
-          </Col>
+						<DatePicker :editable="false" type="date" format="yyyy-MM-dd HH:mm"
-          <Col span="24">
+							placeholder="请选择活动时间" @on-change="onchangeTime" class="perW30"
-            <FormItem label="排序：">
+							v-model="formValidate.valid_time"></DatePicker>
-              <InputNumber
+					</FormItem>
-               v-width="460"
+					</Col>
-                :min="0"
+					<Col span="24">
-                :max="999999"
+					<FormItem label="是否开启：">
-                v-model="formValidate.sort"
+						<i-switch v-model="formValidate.is_show" :true-value="1" :false-value="0" size="large">
-                placeholder="请输入排序"
+							<span slot="open">开启</span>
-              />
+							<span slot="close">关闭</span>
-            </FormItem>
+						</i-switch>
-          </Col>
+					</FormItem>
-          <Col span="24">
+					</Col>
-            <FormItem label="是否开启：">
+				</Row>
-              <i-switch
+			</Form>
-                v-model="formValidate.is_show"
+		</Card>
-                :true-value="1"
+		<Card :bordered="false" dis-hover class="fixed-card"
-                :false-value="0"
+			:style="{ left: `${!menuCollapse ? '200px' : isMobile ? '0' : '80px'}` }">
-                size="large"
+			<Form>
-              >
+				<FormItem>
-                <span slot="open">开启</span>
+					<Button type="primary" class="submission" @click="handleSubmit('formValidate')">保存</Button>
-                <span slot="close">关闭</span>
+				</FormItem>
-              </i-switch>
+			</Form>
-            </FormItem>
+		</Card>
-          </Col>
+	</div>
-        </Row>
-      </Form>
-    </Card>
-    <Card
-      :bordered="false"
-      dis-hover
-      class="fixed-card"
-      :style="{ left: `${!menuCollapse ? '200px' : isMobile ? '0' : '80px'}` }"
-    >
-      <Form>
-        <FormItem>
-          <Button
-            type="primary"
-            class="submission"
-            @click="handleSubmit('formValidate')"
-            >保存</Button
-          >
-        </FormItem>
-      </Form>
-    </Card>
-  </div>
 </template>
 <script>
-import { mapState, mapMutations } from 'vuex'
+	import {
-import { getSupplier, addSupplier, putSupplier } from '@/api/supplier'
+		mapState,
-import { cityApi } from '@/api/store'
+		mapMutations
-import Setting from "@/setting";
+	} from 'vuex'
-export default {
+	import {
-  name: '',
+		getSupplier,
-  components: {},
+		addSupplier,
-  props: {},
+		putSupplier
-  data() {
+	} from '@/api/supplier'
-    return {
+	import {
-      roterPre: Setting.roterPre,
+		cityApi
-      width: 150,
+	} from '@/api/store'
-      addresData: [],
+	import Setting from "@/setting";
-      formValidate: {
+	export default {
-        supplier_name: '',
+		name: '',
-        name: '',
+		components: {},
-        phone: '',
+		props: {},
-        detailed_address: '',
+		data() {
-        address: '',
+			return {
-        addressSelect: [],
+				roterPre: Setting.roterPre,
-        email: '',
+				width: 150,
-        mark: '',
+				addresData: [],
-        account: '',
+				formValidate: {
-        pwd: '',
+					valid_time: '',
-        conf_pwd: '',
+					supplier_name: '',
-        is_show: 0,
+					name: '',
-        province: 0,
+					phone: '',
-        city: 0,
+					detailed_address: '',
-        area: 0,
+					address: '',
-        street: 0,
+					addressSelect: [],
-      },
+					email: '',
-      ruleValidate: {
+					mark: '',
-        supplier_name: [
+					account: '',
-          {
+					pwd: '',
-            required: true,
+					conf_pwd: '',
-            message: '供应商不能为空',
+					is_show: 0,
-            trigger: 'blur',
+					province: 0,
-          },
+					city: 0,
-        ],
+					area: 0,
-        phone: [
+					street: 0,
-          { required: true, message: '联系电话不能为空', trigger: 'blur' },
+				},
-          {
+				ruleValidate: {
-            pattern: /^1[3456789]\d{9}$/,
+					supplier_name: [{
-            message: '手机号码格式不正确',
+						required: true,
-            trigger: 'blur',
+						message: '供应商不能为空',
-          },
+						trigger: 'blur',
-        ],
+					}, ],
-        account: [
+					phone: [{
-          {
+							required: true,
-            required: true,
+							message: '联系电话不能为空',
-            message: '请输入用户名',
+							trigger: 'blur'
-            trigger: 'blur',
+						},
-          },
+						{
-        ],
+							pattern: /^1[3456789]\d{9}$/,
-        address: [
+							message: '手机号码格式不正确',
-          {
+							trigger: 'blur',
-            required: true,
+						},
-            message: '请填写具体地址',
+					],
-            trigger: 'blur',
+					account: [{
-          },
+						required: true,
-        ],
+						message: '请输入用户名',
-        addressSelect: [
+						trigger: 'blur',
-          {
+					}, ],
-            required: true,
+					address: [{
-            message: '请选择省市区',
+						required: true,
-            trigger: 'blur',
+						message: '请填写具体地址',
-          },
+						trigger: 'blur',
-        ],
+					}, ],
-        pwd: [
+					addressSelect: [{
-          {
+						required: true,
-            required: true,
+						message: '请选择省市区',
-            message: '请输入密码',
+						trigger: 'blur',
-            trigger: 'blur',
+					}, ],
-          },
+					pwd: [{
-        ],
+						required: true,
-        conf_pwd: [
+						message: '请输入密码',
-          {
+						trigger: 'blur',
-            required: true,
+					}, ],
-            message: '密码不能为空',
+					conf_pwd: [{
-            trigger: 'blur',
+						required: true,
-          },
+						message: '密码不能为空',
-        ],
+						trigger: 'blur',
-      },
+					}, ],
-    }
+					valid_time:[{
-  },
+						required: true,
-  computed: {
+						message: '请选择时间',
-    ...mapState('admin/layout', ['isMobile', 'menuCollapse']),
+						trigger: 'blur',
-    labelPosition() {
+					}, ]
-      return this.isMobile ? 'top' : 'right'
+				},
-    },
+			}
-  },
+		},
-  watch: {},
+		computed: {
-  created() {
+			...mapState('admin/layout', ['isMobile', 'menuCollapse']),
-    let data = { pid: 0 }
+			labelPosition() {
-    this.cityInfo(data)
+				return this.isMobile ? 'top' : 'right'
-    if (this.$route.params.id) {
+			},
-      this.getSupplier()
+		},
-    }
+		watch: {},
-  },
+		created() {
-  mounted() {},
+			let data = {
-  methods: {
+				pid: 0
-    // 获取省市区
+			}
-    cityInfo(data) {
+			this.cityInfo(data)
-      cityApi(data).then((res) => {
+			if (this.$route.params.id) {
-        this.addresData = res.data
+				this.getSupplier()
-      })
+			}
-    },
+		},
-    loadData(item, callback) {
+		mounted() {},
-      item.loading = true
+		methods: {
-      cityApi({ pid: item.value }).then((res) => {
+			// 具体日期
-        item.children = res.data
+			onchangeTime(e) {
-        item.loading = false
+				this.$nextTick(() => {
-        callback()
+					this.$set(this.formValidate, "valid_time", e);
-      })
+				});
-    },
+			},
-    // 选择省市区
+			// 获取省市区
-    addchack(e, selectedData) {
+			cityInfo(data) {
-      e.forEach((i, index) => {
+				cityApi(data).then((res) => {
-        if (index == 0) {
+					this.addresData = res.data
-          this.formValidate.province = i
+				})
-        } else if (index == 1) {
+			},
-          this.formValidate.city = i
+			loadData(item, callback) {
-        } else if (index == 2) {
+				item.loading = true
-          this.formValidate.area = i
+				cityApi({
-        } else {
+					pid: item.value
-          this.formValidate.street = i
+				}).then((res) => {
-        }
+					item.children = res.data
-      })
+					item.loading = false
-      (this.formValidate.addressSelect)
+					callback()
-      this.formValidate.address = selectedData.map((o) => o.label).join('')
+				})
-    },
+			},
-    // 添加供应商
+			// 选择省市区
-    handleSubmit() {
+			addchack(e, selectedData) {
-      if (this.$route.params.id) {
+				e.forEach((i, index) => {
-        putSupplier(this.$route.params.id,this.formValidate)
+						if (index == 0) {
-          .then(async (res) => {
+							this.formValidate.province = i
-               this.$Message.success(res.msg)
+						} else if (index == 1) {
-                   this.$router.push({ path: this.roterPre + '/supplier/menu/list' })
+							this.formValidate.city = i
-          })
+						} else if (index == 2) {
-          .catch((res) => {
+							this.formValidate.area = i
-            this.$Message.error(res.msg)
+						} else {
-          })
+							this.formValidate.street = i
-      } else {
+						}
-        addSupplier(this.formValidate)
+					})
-          .then(async (res) => {
+					(this.formValidate.addressSelect)
-            this.$Message.success(res.msg)
+				this.formValidate.address = selectedData.map((o) => o.label).join('')
-            this.$router.push({ path: this.roterPre + '/supplier/menu/list' })
+			},
-          })
+			// 添加供应商
-          .catch((res) => {
+			handleSubmit() {
-            this.$Message.error(res.msg)
+				if (this.$route.params.id) {
-            
+					putSupplier(this.$route.params.id, this.formValidate)
-          })
+						.then(async (res) => {
-      }
+							this.$Message.success(res.msg)
-    },
+							this.$router.push({
-    // 获取供应商信息
+								path: this.roterPre + '/supplier/menu/list'
-    getSupplier() {
+							})
-      getSupplier(this.$route.params.id)
+						})
-        .then(async (res) => {
+						.catch((res) => {
-          this.formValidate = res.data
+							this.$Message.error(res.msg)
-          let addressSelect = []
+						})
-          if (res.data.province) {
+				} else {
-            addressSelect.push(res.data.province)
+					addSupplier(this.formValidate)
-          }
+						.then(async (res) => {
-          if (res.data.city) {
+							this.$Message.success(res.msg)
-            addressSelect.push(res.data.city)
+							this.$router.push({
-          }
+								path: this.roterPre + '/supplier/menu/list'
-          if (res.data.area) {
+							})
-            addressSelect.push(res.data.area)
+						})
-          }
+						.catch((res) => {
-          if (res.data.street) {
+							this.$Message.error(res.msg)
-            addressSelect.push(res.data.street)
+
-          }
+						})
-          this.formValidate.addressSelect = addressSelect
+				}
-        })
+			},
-        .catch((res) => {
+			// 获取供应商信息
-          this.$Message.error(res.msg)
+			getSupplier() {
-        })
+				getSupplier(this.$route.params.id)
-    },
+					.then(async (res) => {
-  },
+						this.formValidate = res.data
-}
+						let addressSelect = []
+						if (res.data.province) {
+							addressSelect.push(res.data.province)
+						}
+						if (res.data.city) {
+							addressSelect.push(res.data.city)
+						}
+						if (res.data.area) {
+							addressSelect.push(res.data.area)
+						}
+						if (res.data.street) {
+							addressSelect.push(res.data.street)
+						}
+						this.formValidate.addressSelect = addressSelect
+					})
+					.catch((res) => {
+						this.$Message.error(res.msg)
+					})
+			},
+		},
+	}
 </script>
 <style scoped lang="less">
-.fixed-card {
+	.fixed-card {
-  position: fixed;
+		position: fixed;
-  right: 0;
+		right: 0;
-  bottom: 0;
+		bottom: 0;
-  left: 200px;
+		left: 200px;
-  z-index: 99;
+		z-index: 99;
-  box-shadow: 0 -1px 2px rgb(240, 240, 240);
+		box-shadow: 0 -1px 2px rgb(240, 240, 240);
-}
+	}
-.submission {
+
-  margin-left: 50%;
+	.submission {
-}
+		margin-left: 50%;
+	}
+	#shopp-manager{
+		padding-bottom:85px ;
+	}
 </style>

src/pages/user/list/handle/userDetails.vue

@@ -70,6 +70,26 @@
 								<Button type="success" v-if="row.status==1" >已出局</Button>
 							</div>
 						</template>
+						<template slot-scope="{ row }" slot="sent_day">
+							<div>
+								{{(row.sent_day)}} / {{row.send_day}}天
+							</div>
+						</template>
+						<template slot-scope="{ row }" slot="extracted_num">
+							<div>
+								{{row.extracted_num}} / {{row.sent_num}}
+							</div>
+						</template>
+						<template slot-scope="{ row }" slot="reorder_count">
+							<div>
+								{{row.reorder_count}}次
+							</div>
+						</template>
+						<!-- <template slot-scope="{ row }" slot="addTIme">
+							<div>
+								{{item.add_time|formatDate}}
+							</div>
+						</template> -->
                     </Table>
                     <div class="acea-row row-right page">
                         <Page :total="total" :current.sync="userFrom.page" show-elevator show-total @on-change="pageChange" :page-size="userFrom.limit"  />
@@ -117,13 +137,21 @@
     import { detailsApi, infoApi, visitList, spreadList } from '@/api/user';
     import userForm from './userForm';
     import userInfo from './userInfo';
-
+import {formatDate} from "@/utils/validate.js"
     export default {
         name: 'userDetails',
         components: {
             userForm,
             userInfo
         },
+		filters: {
+		    formatDate(time) {
+		        if (time !== 0) {
+		            let date = new Date(time * 1000)
+		            return formatDate(date, 'yyyy-MM-dd hh:mm')
+		        }
+		    }
+		},
         props: ['levelList', 'labelList', 'groupList', 'fromType'],
         data () {
             return {
@@ -135,8 +163,8 @@
                     { val: 'sign', label: '签到记录' },
                     { val: 'coupon', label: '持有优惠券' },
                     { val: 'balance_change', label: '余额变动' },
-                    { val: 'static_integral', label: '消费分' },
                     { val: 'action_integral', label: '贡献分' },
+                    { val: 'award_integral', label: '参考分' },
                     { val: 'energy', label: '能量值' },
                     { val: 'spread', label: '好友关系' },
                     { val: 'visit', label: '浏览足迹' },
@@ -375,6 +403,29 @@
                         let data = res.data
                         this.userLists = data.list;
                         this.total = data.count;
+						if(this.userFrom.type=='award_integral'){
+							this.userLists = data.list.map((e)=>{
+							e.up_speed = +e.up_speed;
+							e.day_send = +e.day_send;
+							e.extract_num = +e.extract_num;
+							e.sent_num = +e.sent_num;
+							e.num = +e.num;
+							e.extracted_num = +e.extracted_num;
+							e.computedNum = 0;
+							if (e.up_speed > 0) {
+								if (e.send_day > e.sent_day) {
+									e.computedNum = (e.up_speed - e.up_speed_used) / (e.send_day - e
+										.sent_day)
+								}
+							}
+							e.sendValue = (e.day_send+e.computedNum).toFixed(2) * 1;
+							return e
+					});
+						}else{
+							this.userLists = data.list;
+						}
+						
+						
                         switch (this.userFrom.type) {
                         case 'order':
                             this.columns = [
@@ -463,20 +514,20 @@
                                 }
                             ]
                             break;
-						case 'static_integral':
+						case 'action_integral':
 						    this.columns = [
-						        {
+						        // {
-						            title: '获得数量',
+						        //     title: '获得数量',
-						            key: 'num',
+						        //     key: 'num',
-						            minWidth: 100
+						        //     minWidth: 100
-						        },
+						        // },
+								// {
+								//     title: '进场价格',
+								//     key: 'price',
+								//     minWidth: 120
+								// },
 								{
-								    title: '进场价格',
+								    title: '奖励金额',
-								    key: 'price',
-								    minWidth: 120
-								},
-								{
-								    title: '出局总价',
 								    key: 'extract_sum',
 								    minWidth: 120
 								},
@@ -490,45 +541,50 @@
 						            key: 'mark',
 						            minWidth: 120
 						        },
-								{
+								// {
-								    title: '状态',
+								//     title: '状态',
-								    slot: 'status_type',
+								//     slot: 'status_type',
-								    minWidth: 80
+								//     minWidth: 80
-								}
+								// }
 						    ]
 						    break;
-						case 'action_integral':
+						case 'award_integral':
 						    this.columns = [
 						        {
-						            title: '获得数量',
+						            title: '说明',
-						            key: 'num',
+						            key: 'mark',
-						            minWidth: 100
+						            minWidth: 120
 						        },
 								{
-								    title: '进场价格',
+								    title: '释放',
-								    key: 'price',
+								     slot: 'sent_day',
-								    minWidth: 120
+								    minWidth: 80
 								},
 								{
-								    title: '出局总价',
+								    title: '释放值',
-								    key: 'extract_sum',
+								    key: 'sendValue',
-								    minWidth: 120
+								    minWidth: 59
+								},
+								{
+								    title: '提取',
+								     slot: 'extracted_num',
+								    minWidth: 100
 								},
 						        {
-						            title: '获得时间',
+						            title: '复投',
-						            key: '_add_time',
+						            slot: 'reorder_count',
-						            minWidth: 100
+						            minWidth: 50
 						        },
+								{
+								    title: '总量',
+								    key: 'num',
+								    minWidth: 50
+								},
 						        {
-						            title: '备注',
+						            title: '购买时间',
-						            key: 'mark',
+						            key: '_add_time',
 						            minWidth: 120
 						        },
-								{
-								    title: '状态',
-								    slot: 'status_type',
-								    minWidth: 80
-								}
 						    ]
 						    break;
 						case 'energy':

src/pages/user/list/index.vue

@@ -459,8 +459,8 @@
         <vxe-column field="user_type" title="用户类型" min-width="100"></vxe-column>
         <vxe-column field="spread_uid_nickname" title="推荐人" min-width="100"></vxe-column>
         <vxe-column field="now_money" title="余额" min-width="100"></vxe-column>
-        <vxe-column field="static_integral" title="消费分" min-width="100"></vxe-column>
+        <!-- <vxe-column field="static_integral" title="消费分" min-width="100"></vxe-column> -->
-        <vxe-column field="action_integral" title="贡献分" min-width="100"></vxe-column>
+        <!-- <vxe-column field="action_integral" title="贡献分" min-width="100"></vxe-column> -->
         <vxe-column field="energy" title="能量值" min-width="100"></vxe-column>
         <vxe-column field="action" title="操作" align="center" width="180" fixed="right">
           <template v-slot="{ row }">