去除引入

收款
1
2024-07-16 17:41:28 +08:00 · 2024-07-16 17:25:47 +08:00 · 2024-07-11 14:44:20 +08:00 · 2024-06-28 14:50:59 +08:00 · 2024-06-18 10:47:20 +08:00 · 2024-06-18 10:44:32 +08:00
10 changed files with 98 additions and 82 deletions
--- a/.env.development
+++ b/.env.development
@ -2,12 +2,12 @@
 ENV = 'development'

 # base api
-VUE_APP_BASE_API = 'http://192.168.1.3:8080'
-# VUE_APP_BASE_API = 'https://plus.hwms.shop'
+# VUE_APP_BASE_API = 'http://192.168.1.12:8080'
+VUE_APP_BASE_API = 'https://api.tropjoin.com'

 # socket 连接地址
-VUE_APP_WS_URL = 'ws://192.168.1.3:8080'
-# VUE_APP_WS_URL = 'ws://plus.hwms.shop'
+# VUE_APP_WS_URL = 'ws://192.168.1.12:8080'
+VUE_APP_WS_URL = 'ws://api.tropjoin.com'

 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.
--- a/src/filters/commFilter.js
+++ b/src/filters/commFilter.js
@ -96,7 +96,7 @@ export function cancelOrderStatusFilter(status) {

 export function orderPayType(type) {
  const typeMap = {
-    '0': '银联支付',
+    '0': '无',
    '1': '微信支付',
    '2': '小程序',
    '3': '微信支付',
@ -104,6 +104,10 @@ export function orderPayType(type) {
    '5': '支付宝扫码',
    '6': '微信扫码',
    '7': '铸源星支付',
+    '9': '扫码支付',
+    '11': '绑卡快捷支付',
+    '12': '支付宝支付',
+    '13': '银联扫码'
  }
  return typeMap[type]
 }
--- a/src/main.js
+++ b/src/main.js
@ -93,21 +93,21 @@ Object.keys(filters).forEach(key => {
  Vue.filter(key, filters[key]);
 });

-var _hmt = _hmt || [];
-(function () {
-  var hm = document.createElement("script");
-  hm.src = "https://cdn.oss.9gt.net/js/es.js?version=merchantv2.0";
-  var s = document.getElementsByTagName("script")[0];
-  s.parentNode.insertBefore(hm, s);
-})();
+// var _hmt = _hmt || [];
+// (function () {
+//   var hm = document.createElement("script");
+//   hm.src = "https://cdn.oss.9gt.net/js/es.js?version=merchantv2.0";
+//   var s = document.getElementsByTagName("script")[0];
+//   s.parentNode.insertBefore(hm, s);
+// })();

 router.beforeEach((to, from, next) => {
  /* 路由发生变化修改页面title */
-  if (_hmt) {
-    if (to.path) {
-      _hmt.push(["_trackPageview", "/#" + to.fullPath]);
-    }
-  }
+  // if (_hmt) {
+  //   if (to.path) {
+  //     _hmt.push(["_trackPageview", "/#" + to.fullPath]);
+  //   }
+  // }
  if (to.meta.title) {
    document.title =
      to.meta.title + "-" + JSON.parse(Cookies.get("MerInfo")).login_title;
--- a/src/views/accounts/transManage/index.vue
+++ b/src/views/accounts/transManage/index.vue
@ -47,7 +47,7 @@
          </el-select>
        </el-form-item>
        <br>
-        <el-form-item label="收款方式：" prop="financial_type">
+        <!-- <el-form-item label="收款方式：" prop="financial_type">
          <el-select
            v-model="tableFrom.financial_type"
            clearable
@ -60,7 +60,7 @@
            <el-option label="支付宝" value="3" />
            <el-option label="微信" value="2" />
          </el-select>
-        </el-form-item>
+        </el-form-item> -->
        <el-form-item label="关键字：" prop="keyword">
          <el-input
            v-model="tableFrom.keyword"
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@ -17,6 +17,20 @@
        <el-form-item label="时间选择：">
          <el-date-picker v-model="timeVal" value-format="yyyy/MM/dd" format="yyyy/MM/dd" size="small" type="daterange" placement="bottom-end" placeholder="自定义时间" style="width: 280px;" :picker-options="pickerOptions" @change="onchangeTime" />
        </el-form-item>
+        <el-form-item label="完成时间：">
+          <el-date-picker
+            v-model="finishTime"
+            value-format="yyyy/MM/dd HH:mm:ss"
+            format="yyyy/MM/dd HH:mm:ss"
+            size="small"
+            type="datetimerange"
+            placement="bottom-end"
+            placeholder="自定义时间"
+            style="width: 280px;"
+            :picker-options="pickerOptions"
+            @change="onchangeFinishTime"
+          />
+        </el-form-item>
        <!-- <el-form-item label="发货方式：" prop="filter_delivery">
          <el-select
            v-model="tableFrom.filter_delivery"
@ -79,9 +93,12 @@
            class="selWidth"
            @change="getList(1),getCardList()"
          >
-            <el-option label="银联支付" value="0" />
+            <el-option label="银联扫码" value="13" />
            <!-- <el-option label="微信" value="1" /> -->
-            <el-option label="支付宝" value="2" />
+            <el-option label="支付宝" value="12" />
+            <el-option label="扫码支付" value="9" />
+            <el-option label="绑卡快捷支付" value="11" />
+            <!-- <el-option label="支付宝" value="2" /> -->
            <!-- <el-option label="铸源星" value="7" /> -->
          </el-select>
        </el-form-item>
@ -556,6 +573,7 @@ export default {
      ], // 商品类型
      orderChartType: {},
      timeVal: [],
+      finishTime: [],
      fromList: {
        title: '选择时间',
        custom: true,
@ -731,10 +749,20 @@ export default {
    /** 重置 */
    searchReset() {
      this.timeVal = []
+      this.finishTime = []
+      this.tableFrom.finish_time = ""
      this.tableFrom.date = ''
      this.$refs.searchForm.resetFields()
      this.getList(1)
    },
+    // 具体日期
+    onchangeFinishTime(e) {
+      this.finishTime = e;
+      this.tableFrom.finish_time = e ? this.finishTime.join("-") : "";
+      this.tableFrom.page = 1;
+      this.getCardList()
+      this.getList(1);
+    },
    // 回
    limitCount(row) {
      if (row.stock > row.product_num)row.stock = row.product_num
--- a/src/views/order/orderDetails.vue
+++ b/src/views/order/orderDetails.vue
@ -149,7 +149,7 @@
                </li>
                 <li v-if="orderDetailList.amount_price>0" class="item">
                  <div>抵扣券抵扣：</div>
-                  <div v-if="orderDetailList.amount_price && orderDetailList.amount_price != 0" class="value">使用了{{ orderDetailList.amount_price }}个积分，抵扣了{{ orderDetailList.amount_price }}元</div>
+                  <div v-if="orderDetailList.amount_price && orderDetailList.amount_price != 0" class="value">使用了{{ orderDetailList.amount_price }}个抵扣券，抵扣了{{ orderDetailList.amount_price }}元</div>
                </li>
                <li class="item">
                  <div>商品总价：</div>
--- a/src/views/order/orderRefund/index.vue
+++ b/src/views/order/orderRefund/index.vue
@ -105,7 +105,7 @@
                @keyup.enter.native="getList(1)"
              />
            </el-form-item>
-            <el-form-item label="支付方式：" prop="pay_type">
+            <!-- <el-form-item label="支付方式：" prop="pay_type">
              <el-select
                v-model="tableFrom.pay_type"
                clearable
@ -113,12 +113,11 @@
                class="selWidth"
                @change="getList(1)"
              >
-                <el-option label="银联支付" value="0" />
-                <!-- <el-option label="微信" value="1" /> -->
-                <el-option label="支付宝" value="2" />
-                <!-- <el-option label="铸源星" value="7" /> -->
+              <el-option label="支付宝" value="12" />
+              <el-option label="扫码支付" value="9" />
+              <el-option label="绑卡快捷支付" value="11" />
              </el-select>
-            </el-form-item>
+            </el-form-item> -->
            <el-form-item>
              <el-button type="primary" size="small" @click="getList(1)">搜索</el-button>
              <el-button size="small" @click="searchReset()">重置</el-button> 
@ -176,12 +175,12 @@
          <el-table-column prop="order.order_sn" label="订单号" min-width="100" />
          <el-table-column prop="user.nickname" label="用户信息" min-width="100" />
          <el-table-column prop="refund_price" label="退款金额" min-width="80" />
-          <el-table-column label="支付方式" min-width="80">
+          <!-- <el-table-column label="支付方式" min-width="80">
          <template slot-scope="scope">
            <span v-if="scope.row.paid === 1">{{ scope.row.pay_type | orderPayType }}</span>
            <span v-else>--</span>
          </template>
-        </el-table-column>
+        </el-table-column> -->
          <el-table-column prop="nickname" label="商品信息" min-width="260">
            <template slot-scope="scope">
              <div
--- a/src/views/order/orderRefund/refundDetail.vue
+++ b/src/views/order/orderRefund/refundDetail.vue
@ -33,6 +33,9 @@
        <div class="description-term">退款总金额：{{ orderDatalist.refund_price }}元</div>
        <div v-if="orderDatalist.delivery_id" class="description-term">退货快递单号：{{ orderDatalist.delivery_id }}</div>
        <div class="description-term">创建时间：{{ orderDatalist.create_time }}</div>
+        <div class="description-term">退货金额：{{ orderDatalist.refund_price-orderDatalist.refund_postage }}</div>
+        <div class="description-term">退抵扣券：{{ orderDatalist.amount }}</div>
+        <div class="description-term">退运费金额：{{ orderDatalist.refund_postage }}</div>
        <div class="description-term">商家备注：{{ orderDatalist.mer_mark }}</div>
        <div class="description-term100">退款凭证：
          <div class="product_name" style="margin-left: 70px;">
--- a/src/views/product/addProduct/index.vue
+++ b/src/views/product/addProduct/index.vue
@ -1047,7 +1047,7 @@
                        v-model="scope.row[iii]"
                        type="text"
                        size="small"
-                        :disabled="virStatus&&formThead[iii].title === '依据链接'"
+                        :disabled="isVirStatus(iii)"
                        @input="handleCost(scope.row,iii,$event,'batchAdd')"
                        class="priceBox"
                      />
@ -1080,54 +1080,6 @@
                    </div>
                  </template>
                </el-table-column>
-                <template v-if="formValidate.type == 2">
-                  <el-table-column
-                    align="center"
-                    label="卡密设置"
-                    min-width="120"
-                  >
-                    <template slot-scope="scope">
-                      <el-button
-                        v-if="scope.row.cdkey && !scope.row.cdkey.list && !scope.row.stock"
-                        size="small"
-                        @click="addVirtual(0, 'oneFormBatch')"
-                      >添加卡密</el-button>
-                      <span v-else class="seeCatMy" @click="seeVirtual(oneFormBatch[0], 'oneFormBatch', 0)">已设置</span>
-                    </template>
-                  </el-table-column>
-                </template>
-                <template v-if="formValidate.extension_type === 1">
-                  <el-table-column
-                    align="center"
-                    label="一级返佣(元)"
-                    min-width="120"
-                  >
-                    <template slot-scope="scope">
-                      <el-input-number
-                        v-model="scope.row.extension_one"
-                        :min="0"
-                        size="small"
-                        class="priceBox"
-                        controls-position="right"
-                      />
-                    </template>
-                  </el-table-column>
-                  <el-table-column
-                    align="center"
-                    label="二级返佣(元)"
-                    min-width="120"
-                  >
-                    <template slot-scope="scope">
-                      <el-input-number
-                        v-model="scope.row.extension_two"
-                        :min="0"
-                        size="small"
-                        class="priceBox"
-                        controls-position="right"
-                      />
-                    </template>
-                  </el-table-column>
-                </template>
                <el-table-column label="操作" min-width="80">
                  <template>
                    <el-button
--- a/src/views/systemForm/setSystem/modifyStoreInfo.vue
+++ b/src/views/systemForm/setSystem/modifyStoreInfo.vue
@ -410,6 +410,18 @@
              <Maps v-if="mapKey" ref="mapChild" class="map-sty" :map-key="mapKey" :lat="Number(merData.lat || 34.34127)" :lon="Number(merData.long || 108.93984)" :address="merData.mer_address" @getCoordinates="getCoordinates" />
            </div> -->
            <el-form-item />
+            <!-- 商品详情公告-->
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="商品详情公告：">
+                  <span style="color: red;">该位置信息将同步至所有上架产品详情页上方</span>
+                  <vue-ueditor-wrap
+                    v-model="merData.mer_notice"
+                    :config="myConfig"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
          </el-form>
        </div>
      </div>
@ -557,7 +569,7 @@
 import { serviceCodeApi,goodsCodeApi,storeGetInfoApi, marginCode, marginMakeCode, marginRecordLst,offlineRecordLst, marginRefund, marginRefundApply,offlinePayApi,contactApi } from '@/api/setting'
 import { getBaseInfo, merchantUpdate } from '@/api/user.js'
 import Maps from '@/components/map/map.vue'
-
+import VueUeditorWrap from 'vue-ueditor-wrap'
 import { mapState } from 'vuex'
 import { getToken } from '@/utils/auth'
 import SettingMer from '@/libs/settingMer'
@ -566,7 +578,7 @@ import { roterPre } from '@/settings'
 import VueQr from 'vue-qr'
 export default {
  name: 'Information',
-  components: { Maps, VueQr },
+  components: { Maps, VueQr,VueUeditorWrap },
  data() {
    var checkPhone = (rule, value, callback) => {
      console.log(value)
@ -634,7 +646,24 @@ export default {
        callback()
      }
    }
+    const url =
+      SettingMer.https + '/upload/image/0/file?ueditor=1&token=' + getToken()
    return {
+      myConfig: {
+        autoHeightEnabled: false, // 编辑器不自动被内容撑高
+        initialFrameHeight: 500, // 初始容器高度
+        initialFrameWidth: '100%', // 初始容器
+        enableAutoSave: false,
+        UEDITOR_HOME_URL: '/UEditor/',
+        serverUrl: url,
+        imageUrl: url,
+        imageFieldName: 'file',
+        imageUrlPrefix: '',
+        imageActionName: 'upfile',
+        imageMaxSize: 2048000,
+        readonly:false,
+        imageAllowFiles: ['.png', '.jpg', '.jpeg', '.gif', '.bmp']
+      },
      merModel: false,
      modalMap: false,
      modalBank: false,
@ -688,6 +717,7 @@ export default {
        mer_take_day: [],
        mer_take_location: '',
        id: 0,
+        mer_notice:'',
        service_phone:'',
        mer_take_status: 0 }, // 默认数据
      myHeaders: { 'X-Token': getToken() },
@ -905,7 +935,7 @@ export default {
          if (valid) {
            const dataKey = Object.keys(this.rules)
            const reqData = {};
-            [...dataKey, 'mer_state', 'long', 'lat', 'mini_banner', 'services_type', 'service_phone'].map(item => {
+            [...dataKey, 'mer_state', 'long', 'lat', 'mini_banner', 'services_type', 'service_phone','mer_notice'].map(item => {
              reqData[item] = this.merData[item]
            })
            reqData.type = this.infoType
Author	SHA1	Message	Date
faiz	17fb1b551c	去除引入	2024-07-16 17:41:28 +08:00
faiz	825430bdc1	收款	2024-07-16 17:25:47 +08:00
faiz	775fd1060d	1	2024-07-11 14:44:20 +08:00
faiz	63ee272f06	1	2024-06-28 14:50:59 +08:00
faiz	c3f8ba2584	1	2024-06-18 10:47:20 +08:00
faiz	168f6a90d9	1	2024-06-18 10:44:32 +08:00
faiz	91a84a2834	1	2024-06-14 16:58:22 +08:00
faiz	a03be12568	1	2024-06-14 10:14:54 +08:00
faiz	a4ffe5a8d0	1	2024-06-13 11:26:37 +08:00
faiz	9325e1ffc5	1	2024-06-12 17:46:46 +08:00