feat admin

template/admin/src/components/copyright/index.vue

@@ -45,12 +45,12 @@ export default {
   },
   methods: {
     getVersion() {
-      this.version = this.$store.state.userInfo.version;
-      getCrmebCopyRight().then((res) => {
-        this.copyright = res.data.copyrightContext;
-        Session.set('copyright', res.data.copyrightContext);
-        this.isShow = true;
-      });
+      // this.version = this.$store.state.userInfo.version;
+      // getCrmebCopyRight().then((res) => {
+      //   this.copyright = res.data.copyrightContext;
+      //   Session.set('copyright', res.data.copyrightContext);
+      //   this.isShow = true;
+      // });
     },
   },
 };

template/admin/src/pages/account/login/index.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="page-account">
     <div class="container" :class="[fullWidth > 768 ? 'containerSamll' : 'containerBig']">
-      <swiper :options="swiperOption" class="swiperPross" v-if="fullWidth > 768">
+      <!--<swiper :options="swiperOption" class="swiperPross" v-if="fullWidth > 768">
         <swiper-slide class="swiperPic" v-for="(item, index) in swiperList" :key="index">
           <img :src="item.slide" alt="" />
         </swiper-slide>
         <div class="swiper-pagination" slot="pagination"></div>
-      </swiper>
+      </swiper>-->
       <div class="index_from page-account-container from-wh">
         <div class="page-account-top">
           <div class="page-account-top-logo">
@@ -66,12 +66,12 @@
       :imgSize="{ width: '330px', height: '155px' }"
       ref="verify"
     ></Verify>
-    <div class="footer">
+    <!--<div class="footer">
       <div class="pull-right" v-if="copyright">{{ copyright }}</div>
       <div class="pull-right" v-else>
         Copyright © 2014-2025 <a href="https://www.crmeb.com" target="_blank">{{ version }}</a>
       </div>
-    </div>
+    </div>-->
   </div>
 </template>
 <script>

template/admin/src/pages/marketing/point_record/index.vue

@@ -26,7 +26,7 @@
               class="mr20"
             ></el-date-picker>
           </el-form-item>
-          <el-form-item label="交易类型：">
+          <!--<el-form-item label="交易类型：">
             <el-select
               type="button"
               v-model="formValidate.trading_type"
@@ -41,7 +41,7 @@
                 :key="index"
               ></el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item>-->
         </el-form>
       </div>
     </el-card>

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

@@ -13,10 +13,10 @@
           <el-select v-model="orderData.status" clearable @change="selectChange2" placeholder="全部">
             <el-option label="全部订单" value="" />
             <el-option label="普通订单" value="1" />
-            <el-option v-permission="'combination'" label="拼团订单" value="2" />
+           <!-- <el-option v-permission="'combination'" label="拼团订单" value="2" />
             <el-option v-permission="'seckill'" label="秒杀订单" value="3" />
             <el-option v-permission="'bargain'" label="砍价订单" value="4" />
-            <el-option label="预售订单" value="5" />
+            <el-option label="预售订单" value="5" />-->
           </el-select>
         </el-form-item>
         <el-form-item label="支付方式：">
@@ -49,9 +49,9 @@
             <el-select v-model="orderData.field_key" slot="prepend" style="width: 100px">
               <el-option value="all" label="全部"></el-option>
               <el-option value="order_id" label="订单号"></el-option>
-              <el-option value="uid" label="UID"></el-option>
+              <!-- <el-option value="uid" label="UID"></el-option> -->
               <el-option value="real_name" label="用户姓名"></el-option>
-              <el-option value="user_phone" label="用户电话"></el-option>
+              <!-- <el-option value="user_phone" label="用户电话"></el-option> -->
               <el-option value="title" label="商品名称"></el-option>
             </el-select>
           </el-input>
@@ -113,9 +113,9 @@ export default {
       payList: [
         { label: '全部', val: '' },
         { label: '微信支付', val: '1' },
-        { label: '支付宝支付', val: '4' },
-        { label: '余额支付', val: '2' },
-        { label: '线下支付', val: '3' },
+        // { label: '支付宝支付', val: '4' },
+        // { label: '余额支付', val: '2' },
+        // { label: '线下支付', val: '3' },
       ],
       pickerOptions: timeOptions,
     };

template/admin/src/pages/order/orderList/components/tableList.vue

@@ -10,7 +10,7 @@
         name="1"
         :label="orderChartType.un_send > 0 ? `待发货(${orderChartType.un_send})` : `待发货`"
       ></el-tab-pane>
-      <el-tab-pane name="5" label="待核销"></el-tab-pane>
+      <!-- <el-tab-pane name="5" label="待核销"></el-tab-pane> -->
       <el-tab-pane name="2" label="待收货"></el-tab-pane>
       <el-tab-pane name="3" label="待评价"></el-tab-pane>
       <el-tab-pane name="4" label="已完成"></el-tab-pane>
@@ -18,12 +18,12 @@
       <el-tab-pane name="-4" label="已删除"></el-tab-pane>
     </el-tabs>
     <div class="acea-row">
-      <el-button v-auth="['order-write']" type="primary" v-db-click @click="writeOff">订单核销</el-button>
-      <el-button v-db-click @click="batchShipmentModal = true">批量发货</el-button>
+      <!-- <el-button v-auth="['order-write']" type="primary" v-db-click @click="writeOff">订单核销</el-button> -->
+      <!-- <el-button v-db-click @click="batchShipmentModal = true">批量发货</el-button> -->
       <!-- <el-upload class="mr14" :action="expressUrl" :headers="header" :on-success="upExpress">
         <el-button class="export" type="primary">批量发货</el-button>
       </el-upload> -->
-      <el-button v-auth="['order-dels']" v-db-click @click="delAll">批量删除</el-button>
+      <!-- <el-button v-auth="['order-dels']" v-db-click @click="delAll">批量删除</el-button> -->
       <el-button v-auth="['export-storeOrder']" class="export" v-db-click @click="exportList">订单导出</el-button>
       <!-- <el-button class="export" v-db-click @click="exportDeliveryList">发货单导出</el-button> -->
     </div>
@@ -209,11 +209,11 @@
                   >确认付款</el-dropdown-item
                 >
                 <el-dropdown-item command="2">订单详情</el-dropdown-item>
-                <el-dropdown-item command="11" v-show="scope.row._status >= 3 && scope.row.express_dump"
+                <!-- <el-dropdown-item command="11" v-show="scope.row._status >= 3 && scope.row.express_dump"
                   >电子面单打印</el-dropdown-item
-                >
-                <el-dropdown-item command="10" v-show="scope.row._status >= 2">小票打印</el-dropdown-item>
-                <el-dropdown-item
+                > -->
+                <!-- <el-dropdown-item command="10" v-show="scope.row._status >= 2">小票打印</el-dropdown-item> -->
+                <!-- <el-dropdown-item
                   command="4"
                   v-show="
                     scope.row._status !== 1 ||
@@ -222,7 +222,7 @@
                       scope.row.use_integral >= scope.row.back_integral)
                   "
                   >订单备注</el-dropdown-item
-                >
+                > -->
                 <el-dropdown-item
                   command="5"
                   v-show="scope.row.paid == 1 && scope.row.refund_status == 0 && !scope.row.refund.length"
@@ -232,8 +232,8 @@
                 <!--                            <el-dropdown-item command="7"  v-show='scope.row._status === 3'>不退款</el-dropdown-item>-->
                 <el-dropdown-item command="8" v-show="scope.row._status === 4">已收货</el-dropdown-item>
                 <el-dropdown-item command="9">删除订单</el-dropdown-item>
-                <el-dropdown-item command="12" v-show="scope.row.kuaidi_label">快递面单打印</el-dropdown-item>
-                <el-dropdown-item command="13" v-show="scope.row.paid">配货单打印</el-dropdown-item>
+                <!-- <el-dropdown-item command="12" v-show="scope.row.kuaidi_label">快递面单打印</el-dropdown-item> -->
+                <!-- <el-dropdown-item command="13" v-show="scope.row.paid">配货单打印</el-dropdown-item> -->
               </el-dropdown-menu>
             </el-dropdown>
           </template>

template/admin/src/pages/order/orderList/handle/orderDetails.vue

@@ -103,26 +103,26 @@
                   <div>商品总价：</div>
                   <div class="value">{{ orderDatalist.orderInfo.total_price }}</div>
                 </li>
-                <li class="item">
+                <!-- <li class="item">
                   <div>优惠券金额：</div>
                   <div class="value">{{ orderDatalist.orderInfo.coupon_price }}</div>
-                </li>
+                </li> -->
                 <li class="item">
                   <div>积分抵扣：</div>
                   <div class="value">{{ orderDatalist.orderInfo.deduction_price || '0.0' }}</div>
                 </li>
-                <li class="item">
+                <!-- <li class="item">
                   <div>交付邮费：</div>
                   <div class="value">{{ orderDatalist.orderInfo.pay_postage }}</div>
-                </li>
-                <li class="item">
+                </li> -->
+                <!-- <li class="item">
                   <div>用户等级优惠：</div>
                   <div class="value">{{ orderDatalist.orderInfo.levelPrice || '0.0' }}</div>
                 </li>
                 <li class="item">
                   <div>付费会员优惠：</div>
                   <div class="value">{{ orderDatalist.orderInfo.memberPrice || '0.0' }}</div>
-                </li>
+                </li> -->
                 <li class="item">
                   <div>实际支付：</div>
                   <div class="value">{{ orderDatalist.orderInfo.pay_price || '0.0' }}</div>

template/admin/src/pages/product/productAdd/components/BasicInfo.vue

@@ -109,7 +109,7 @@
         <span class="addfont" v-db-click @click="addCate">新增分类</span>
       </el-form-item>
     </el-col>
-    <el-col :span="24">
+    <!--<el-col :span="24">
       <el-form-item label="商品标签：">
         <div class="flex">
           <useLabel
@@ -120,7 +120,7 @@
           <el-button v-db-click @click="addGoodsTag">选择标签</el-button>
         </div>
       </el-form-item>
-    </el-col>
+    </el-col>-->
     <el-col :span="24">
       <el-form-item label="商品状态：">
         <el-radio-group v-model="formValidate.is_show">
@@ -129,6 +129,15 @@
         </el-radio-group>
       </el-form-item>
     </el-col>
+    <el-col :span="24">
+      <el-form-item label="商品类型：">
+        <el-radio-group v-model="formValidate.goods_user_type">
+          <el-radio :label="0" class="radio">普通</el-radio>
+            <el-radio :label="1" class="radio">业务员</el-radio>
+          <el-radio :label="2">经销商</el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-col>
   </el-row>
 </template>
 

template/admin/src/pages/product/productAdd/index.vue

@@ -92,7 +92,7 @@
 
         <!-- 物流设置-->
         <logistics-setting
-          v-show="headTab.length === 7 ? currentTab === '4' : false"
+          v-show="headTab.length === 4 ? currentTab === '4' : false"
           :formValidate="formValidate"
           :templateList="templateList"
           @logisticsBtn="logisticsBtn"
@@ -101,7 +101,7 @@
 
         <!-- 会员价/佣金 -->
         <price-commission
-          v-show="headTab.length === 7 ? currentTab === '5' : currentTab === '4'"
+          v-show="headTab.length === 7 ? currentTab === '5' : currentTab === '5'"
           :formValidate="formValidate"
           :oneFormValidate="oneFormValidate"
           :manyFormValidate="manyFormValidate"
@@ -157,14 +157,14 @@
           <el-button v-if="currentTab !== '1'" v-db-click @click="upTab">上一步</el-button>
           <el-button
             class="submission"
-            v-if="currentTab !== '7' && formValidate.virtual_type == 0"
+            v-if="currentTab !== '4' && formValidate.virtual_type == 0"
             v-db-click
             @click="downTab"
             >下一步</el-button
           >
           <el-button
             class="submission"
-            v-if="currentTab !== '6' && formValidate.virtual_type != 0"
+            v-if="currentTab !== '4' && formValidate.virtual_type != 0"
             v-db-click
             @click="downTab"
             >下一步</el-button
@@ -403,9 +403,9 @@ export default {
         { tit: '规格库存', name: '2' },
         { tit: '商品详情', name: '3' },
         { tit: '物流设置', name: '4' },
-        { tit: '会员价/佣金', name: '5' },
-        { tit: '营销设置', name: '6' },
-        { tit: '其他设置', name: '7' },
+        // { tit: '会员价/佣金', name: '5' },
+        // { tit: '营销设置', name: '6' },
+        // { tit: '其他设置', name: '7' },
       ],
       virtual: [
         { tit: '普通商品', id: 0, tit2: '物流发货' },
@@ -485,6 +485,7 @@ export default {
       currentIndex: 0,
 
       formValidate: {
+        goods_user_type:0,//是否是经销商的货
         disk_info: '', //卡密类型
         logistics: ['1'], //选择物流方式
         freight: 2, //运费设置
@@ -868,9 +869,9 @@ export default {
         { tit: '规格库存', name: '2' },
         { tit: '商品详情', name: '3' },
         { tit: '物流设置', name: '4' },
-        { tit: '会员价/佣金', name: '5' },
-        { tit: '营销设置', name: '6' },
-        { tit: '其他设置', name: '7' },
+        // { tit: '会员价/佣金', name: '5' },
+        // { tit: '营销设置', name: '6' },
+        // { tit: '其他设置', name: '7' },
       ];
       const virtualHeadTabs = [
         { tit: '基础信息', name: '1' },

template/admin/src/pages/product/productList/index.vue

@@ -161,10 +161,10 @@
         <router-link v-auth="['product-product-save']" :to="$routeProStr + '/product/add_product'"
           ><el-button type="primary" class="mr14">添加商品</el-button></router-link
         >
-        <el-button v-auth="['product-crawl-save']" type="success" class="mr14" v-db-click @click="onCopy"
+        <!--<el-button v-auth="['product-crawl-save']" type="success" class="mr14" v-db-click @click="onCopy"
           >商品采集</el-button
-        >
-        <el-dropdown class="bnt mr14" @command="batchSelect">
+        >-->
+      <!--   <el-dropdown class="bnt mr14" @command="batchSelect">
           <el-button>批量修改<i class="el-icon-arrow-down el-icon--right"></i></el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item :command="1">商品分类</el-dropdown-item>
@@ -195,7 +195,7 @@
             <el-dropdown-item :command="2">商品导出</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-        <el-button v-auth="['export-storeProduct']" class="export" v-db-click @click="onExports(0)">数据导出</el-button>
+        <el-button v-auth="['export-storeProduct']" class="export" v-db-click @click="onExports(0)">数据导出</el-button>-->
       </div>
       <el-table
         ref="table"
@@ -317,12 +317,12 @@
                     ><a>查看评论</a></router-link
                   >
                 </el-dropdown-item>
-                <el-dropdown-item v-db-click @click.native="openModal(scope.row, 'vipPriceSet')"
+                <!-- <el-dropdown-item v-db-click @click.native="openModal(scope.row, 'vipPriceSet')"
                   >会员价管理</el-dropdown-item
                 >
                 <el-dropdown-item v-db-click @click.native="openModal(scope.row, 'brokerageSet')"
                   >佣金管理</el-dropdown-item
-                >
+                >-->
                 <el-dropdown-item
                   v-if="artFrom.type === '6'"
                   v-db-click

template/admin/src/pages/user/list/index.vue

@@ -14,15 +14,15 @@
             <div>
               <el-form-item label="用户搜索：" label-for="nickname">
                 <el-input v-model="userFrom.nickname" placeholder="请输入用户" clearable class="form_content_width">
-                  <el-select v-model="field_key" slot="prepend" style="width: 100px">
+                 <!-- <el-select v-model="field_key" slot="prepend" style="width: 100px">
                     <el-option value="all" label="全部"></el-option>
                     <el-option value="uid" label="UID"></el-option>
                     <el-option value="phone" label="手机号"></el-option>
                     <el-option value="nickname" label="用户昵称"></el-option>
-                  </el-select>
+                  </el-select>-->
                 </el-input>
               </el-form-item>
-              <el-form-item label="用户等级：" label-for="level">
+             <!-- <el-form-item label="用户等级：" label-for="level">
                 <el-select v-model="level" placeholder="请选择用户等级" clearable class="form_content_width">
                   <el-option value="all" label="全部">全部</el-option>
                   <el-option
@@ -33,7 +33,7 @@
                   ></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="用户分组：">
+             <!-- <el-form-item label="用户分组：">
                 <el-select v-model="group_id" placeholder="请选择用户分组" clearable class="form_content_width">
                   <el-option value="all" label="全部"></el-option>
                   <el-option
@@ -43,15 +43,15 @@
                     :label="item.group_name"
                   ></el-option>
                 </el-select>
-              </el-form-item>
+              </el-form-item>-->
             </div>
             <el-form-item class="search-form-sub">
               <el-button type="primary" v-db-click @click="userSearchs">搜索</el-button>
               <el-button class="ResetSearch" v-db-click @click="reset('userFrom')">重置</el-button>
-              <a class="ivu-ml-8 font12 ml10" v-db-click @click="collapse = !collapse">
+            <!--  <a class="ivu-ml-8 font12 ml10" v-db-click @click="collapse = !collapse">
                 <template v-if="!collapse"> 展开 <i class="el-icon-arrow-down" /> </template>
                 <template v-else> 收起 <i class="el-icon-arrow-up" /> </template>
-              </a>
+              </a>-->
             </el-form-item>
           </div>
           <div v-if="collapse" class="acea-row search-form">
@@ -279,7 +279,7 @@
       <el-tabs v-model="userFrom.user_type" @tab-click="onClickTab">
         <el-tab-pane :label="item.name" :name="item.type" v-for="(item, index) in headeNum" :key="index" />
       </el-tabs>
-      <el-row :gutter="24" justify="space-between">
+      <!--<el-row :gutter="24" justify="space-between">
         <el-col :span="24">
           <el-button v-auth="['admin-user-save']" type="primary" v-db-click @click="edit({ uid: 0 })"
             >添加用户</el-button
@@ -298,7 +298,7 @@
           <el-button v-auth="['admin-user-set_label']" v-db-click @click="setLabel">批量设置标签</el-button>
           <el-button class="mr10" v-db-click @click="exportList">导出</el-button>
 
-          <!-- <el-button v-auth="['admin-user-synchro']" class="mr20" v-db-click @click="synchro">同步公众号用户</el-button> -->
+         <el-button v-auth="['admin-user-synchro']" class="mr20" v-db-click @click="synchro">同步公众号用户</el-button>
         </el-col>
         <el-col :span="24" class="userAlert" v-if="selectionList.length">
           <el-alert show-icon>
@@ -307,7 +307,7 @@
             </template>
           </el-alert>
         </el-col>
-      </el-row>
+      </el-row>-->
       <el-table
         :data="userLists"
         class="mt16"
@@ -348,7 +348,12 @@
             <div v-if="scope.row.is_del == 1" style="color: red">用户已注销</div>
           </template>
         </el-table-column>
-        <el-table-column label="付费会员" min-width="90">
+        <el-table-column label="积分" min-width="100">
+          <template slot-scope="scope">
+            <div>{{ scope.row.integral }}</div>
+          </template>
+        </el-table-column>
+        <!--<el-table-column label="付费会员" min-width="90">
           <template slot-scope="scope">
             <div>{{ scope.row.isMember ? '是' : '否' }}</div>
           </template>
@@ -382,25 +387,25 @@
           <template slot-scope="scope">
             <div>{{ scope.row.now_money }}</div>
           </template>
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column label="操作" fixed="right" width="120">
           <template slot-scope="scope">
             <template v-if="scope.row.is_del != 1">
-              <a v-db-click @click="userDetail(scope.row)">详情</a>
+              <!-- <a v-db-click @click="userDetail(scope.row)">详情</a> -->
 
               <el-divider direction="vertical"></el-divider>
               <el-dropdown size="small" @command="changeMenu(scope.row, $event, scope.$index)" :transfer="true">
                 <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i> </span>
                 <el-dropdown-menu slot="dropdown">
                   <!-- <el-dropdown-item command="1">编辑</el-dropdown-item> -->
-                  <el-dropdown-item command="2">修改余额</el-dropdown-item>
+                  <!-- <el-dropdown-item command="2">修改余额</el-dropdown-item> -->
                   <el-dropdown-item command="8">修改积分</el-dropdown-item>
-                  <el-dropdown-item command="3">赠送会员</el-dropdown-item>
+                  <!-- <el-dropdown-item command="3">赠送会员</el-dropdown-item> -->
                   <!--                                <el-dropdown-item command="4" v-if="row.vip_name">清除等级</el-dropdown-item>-->
-                  <el-dropdown-item command="5">设置分组</el-dropdown-item>
-                  <el-dropdown-item command="6">设置标签</el-dropdown-item>
-                  <el-dropdown-item command="7">修改上级推广人</el-dropdown-item>
-                  <el-dropdown-item command="99" v-if="scope.row.spread_uid">清除上级推广人</el-dropdown-item>
+                  <!-- <el-dropdown-item command="5">设置分组</el-dropdown-item> -->
+                  <!-- <el-dropdown-item command="6">设置标签</el-dropdown-item> -->
+                  <!-- <el-dropdown-item command="7">修改上级推广人</el-dropdown-item> -->
+                  <!-- <el-dropdown-item command="99" v-if="scope.row.spread_uid">清除上级推广人</el-dropdown-item> -->
                 </el-dropdown-menu>
               </el-dropdown>
             </template>
@@ -576,11 +581,11 @@ export default {
       collapse: false,
       headeNum: [
         { type: '', name: '全部' },
-        { type: 'wechat', name: '微信公众号' },
-        { type: 'routine', name: '微信小程序' },
-        { type: 'h5', name: 'H5' },
-        { type: 'pc', name: 'PC' },
-        { type: 'app', name: 'APP' },
+        // { type: 'wechat', name: '微信公众号' },
+        // { type: 'routine', name: '微信小程序' },
+        // { type: 'h5', name: 'H5' },
+        // { type: 'pc', name: 'PC' },
+        // { type: 'app', name: 'APP' },
       ],
       address: [],
       addresData: [],

template/admin/src/setting.js

@@ -1,5 +1,5 @@
 // 请求接口地址 如果没有配置自动获取当前网址路径
-const VUE_APP_API_URL = process.env.VUE_APP_API_URL || `${location.origin}/adminapi`;
+const VUE_APP_API_URL = `https://cjxmall.dnzc.vip/adminapi`;
 
 const Setting = {
   // 路由前缀