客户详情

hd/src/views/goods/goods-add.vue

@@ -76,7 +76,7 @@
 				<el-form-item label="简介" prop="content">
 					<cl-editor-quill v-model="ruleForm.content" @load="editor"></cl-editor-quill>
 				</el-form-item>
-				<el-form-item label="节日涨价 ">
+				<el-form-item label="涨价设置">
 					<el-checkbox-group v-model="ruleForm.autoRise">
 						<el-checkbox label="1" name="autoRise" true-label="1" false-label="0">
 							<span>需要</span>

hdApp/src/App.vue

@@ -15,7 +15,7 @@ import store from '@/store'
 			if (process.env.NODE_ENV == "development") {
 				uni.setStorageSync(
 					"token",
-					"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiIsImp0aSI6IjBfNTIifQ.eyJpc3MiOiJodHRwczpcL1wvYXBpLnNob3AuaHpnaGQuY29tIiwiYXVkIjoiaHR0cHM6XC9cL2FwaS5zaG9wLmh6Z2hkLmNvbSIsImp0aSI6IjBfNTIiLCJpYXQiOjE2MTYxNTc2NjQsIm5iZiI6MTYxNjE1NzY2NCwiZXhwIjoxNjI0Nzk3NjY0LCJ1bmlxdWVJZCI6IjUyIiwic291cmNlSWQiOjB9.VzSekbSwSczMWsfdPVdrm3gZ-v9o3p01NbMVNT4nGZ4"
+					"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiIsImp0aSI6IjBfNTgifQ.eyJpc3MiOiJodHRwczpcL1wvYXBpLnNob3AuaHVhbWwuY29tIiwiYXVkIjoiaHR0cHM6XC9cL2FwaS5zaG9wLmh1YW1sLmNvbSIsImp0aSI6IjBfNTgiLCJpYXQiOjE2MTc5NTI2MjEsIm5iZiI6MTYxNzk1MjYyMSwiZXhwIjoxNjI2NTkyNjIxLCJ1bmlxdWVJZCI6IjU4Iiwic291cmNlSWQiOjB9.u7ntP_TOgw_NoTU5B1CBaiz7VIJm-yoYKubTxwTdK3A"
 				);
 				uni.setStorageSync("account", "0");
 				getDictionaries({ token: uni.getStorageSync('token') }).then(res => {

hdApp/src/admin/goodsManage/add.vue

@@ -82,7 +82,7 @@
           </label>
         </tui-list-cell>
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">配送方式</div>
+          <div class="tui-title">配送类型</div>
           <label for="sendType" class="tui-input" @click="needSendChange(form.needSend)">
             <checkbox
               id="sendType"
@@ -91,7 +91,7 @@
               @change="giftChange"
               style="transform: scale(0.7,0.7);"
             ></checkbox>
-            <span>到店自取</span>
+            <span>自取商品</span>
           </label>
         </tui-list-cell>
         <tui-list-cell class="line-cell" :hover="false">

hdApp/src/admin/goodsManage/category.vue

@@ -15,7 +15,7 @@
 							<div class="operate-det">
 								<span>商品数: {{ item.goodsNum }}</span>
 								<span>销量: {{ item.sold }}</span>
-								<span :style="{color: item.status == 1 ? '#049E2C' : '#ff6900'}">{{ item.status == 1? '启用' : '禁用' }}</span>
+								<span :style="{color: item.status == 1 ? '#049E2C' : '#ff6900'}">{{ item.status == 1? '启用' : '停用' }}</span>
 							</div>
 							<div class="operate-icon-wrap" @click="operateFn(item, index)">
 								<div class="operate-icon">
@@ -133,7 +133,7 @@ export default {
 					}
 				},
 				{
-					text: this.operateData.status == 1 ? '禁用' : '启用',
+					text: this.operateData.status == 1 ? '停用' : '启用',
 					icon: this.operateData.status == 1 ? 'iconjinyong' : 'iconqiyong',
 					click: () => {
 						this.changeStatusFn()

hdApp/src/admin/goodsManage/list.vue

@@ -31,22 +31,20 @@
           <!--内容部分 start -->
           <block v-if="!$util.isEmpty(list.data)">
             <div class="page-view">
-              <div class="goods-list" v-for="(item, idx) in list.data" :key="idx">
+              <div class="goods-list" v-for="(goodsItem, idx) in list.data" :key="idx">
                 <div class="goods-list-top">
                   <div class="img-blo">
-                    <img :src="item.smallImgList[0]" alt="商品图" mode="aspectFit" />
+                    <img :src="goodsItem.smallImgList[0]" alt="商品图" mode="aspectFit" />
                   </div>
                   <div class="goods-det">
                     <div class="goods-det-top">
-                      <div class="goods-name">{{ item.goodsName }}</div>
-                      <!-- <div class="goods-sales">已售{{ item.sold }}</div> -->
-                      <!-- <div class="goods-sales">{{ item.categoryName }}</div> -->
+                      <div class="goods-name">{{ goodsItem.goodsName }}</div>
                     </div>
                     <div class="operate-wrap">
-                      <div class="goods-price">￥{{ item.price }}</div>
+                      <div class="goods-price">￥{{ goodsItem.price }}</div>
                       <div 
                         class="operate-icon-wrap" 
-                        @click.stop="operateFn(item, idx)">
+                        @click.stop="operateFn(goodsItem, idx)">
                         <div class="operate-icon">
                           <i
                             class="iconfont"
@@ -59,9 +57,9 @@
                   </div>
                 </div>
                 <div class="goods-list-bottom flex-center-between">
-                  <div>已售: {{ item.sold }}</div>
-                  <div>库存: {{ item.stock == -1 ? '充足' : item.stock }}</div>
-                  <div>浏览: {{ item.viewNum }}</div>
+                  <div>已售: {{ goodsItem.sold }}</div>
+                  <div>库存: {{ goodsItem.stock == -1 ? '充足' : goodsItem.stock }}</div>
+                  <div>浏览: {{ goodsItem.viewNum }}</div>
                 </div>
               </div>
             </div>
@@ -175,7 +173,7 @@ export default {
             click: () => this.$util.pageTo("/admin/goodsManage/category")
         },
         {
-          name: "节日涨价",
+          name: "涨价设置",
           click: () => this.$util.pageTo("/admin/goodsManage/price-increase")
         }
       ]
@@ -183,48 +181,35 @@ export default {
   },
   computed: {
     btnData() {
+      let self = this;
       return [
-        // {
-        // 	text: '置顶',
-        // 	icon: 'iconzhiding',
-        // 	click: () => {
-        // 		this.delModal = true
-        // 	}
-        // },
         {
           text: "编辑",
           icon: "iconbianji",
           click: function() {
-            this.$util.pageTo({
+            self.$util.pageTo({
               url: "/admin/goodsManage/add",
               query: {
-                type: this.tabIndex,
-                id: this.operateData.id
+                type: self.tabIndex,
+                id: self.operateData.id
               }
             });
           }
         },
         {
-          text: this.operateData.status == 1 ? "下架" : "上架",
-          icon: this.operateData.status == 1 ? "iconxiajia" : "iconqiyong",
+          text: self.operateData.status == 1 ? "下架" : "上架",
+          icon: self.operateData.status == 1 ? "iconxiajia" : "iconqiyong",
           click: () => {
-            this.changeStatusFn();
+            self.changeStatusFn();
           }
         },
         {
           text: "删除",
           icon: "iconshanchu1",
           click: () => {
-            this.delModal = true;
+            self.delModal = true;
           }
         }
-        // {
-        //   text: "分享",
-        //   icon: "iconfenxiang1",
-        //   click: () => {
-        //     this.$msg("功能开发中...");
-        //   }
-        // }
       ];
     }
   },
@@ -243,11 +228,11 @@ export default {
   methods: {
     operateLine(index) {
       if (index === 0) {
-        this.$util.pageTo("/admin/goodsManage/freight");
+        this.$util.pageTo("/admin/goodsManage/category");
       } else if (index === 1) {
-        this.$msg("请在电脑端进行设置!");
-      } else if (index === 2) {
         this.$util.pageTo("/admin/goodsManage/price-increase");
+      } else{
+
       }
     },
     operateList(index) {
@@ -338,12 +323,6 @@ export default {
         that.scrollTop = 0;
       }
     },
-    // operate
-    // operateCancle() {
-    // 	this.operateData = {}
-    // 	this.operateIndex = null
-    // 	this.operateShow = false
-    // },
     changeOperateShowFn() {
       this.operateBottomShow = !this.operateBottomShow;
     },
@@ -519,4 +498,4 @@ page {
     }
   }
 }
-</style>
+</style>

hdApp/src/admin/goodsManage/price-increase.vue

@@ -39,11 +39,11 @@
 				<block v-else>
 					<tui-list-cell class="line-cell" :hover="false">
 						<div class="tui-title">金额</div>
-						<input v-model="form.riseAmount" placeholder-class="phcolor" class="tui-input" name="phone" placeholder="涨价80元请输入80" maxlength="50" type="number" />
+						<input v-model="form.riseAmount" placeholder-class="phcolor" class="tui-input" name="phone" placeholder="涨价80元，请输入80" maxlength="50" type="number" />
 					</tui-list-cell>
 				</block>
 			</div>
-			<div class="prompt-text">节日当天和前一天，设置涨价的商品将统一按上面规则涨价。</div>
+			<div class="prompt-text">节日当天和前一天，要求涨价的商品统一按上面规则涨价。</div>
 		</block>
 		<button class="admin-button-com blue big confirm-btn" @click="setPrice">确定</button>
 	</div>

hdApp/src/admin/member/detail.vue

@@ -335,7 +335,7 @@ export default {
           value: 0
         },
         {
-          name: "累计消费(¥)",
+          name: "累计消费",
           value: 0
         }
       ],
@@ -359,14 +359,16 @@ export default {
           name: "备注",
           img: `${this.$constant.imgUrl}/retail/member/tab-icon-4.png`,
           funtion: () => {
-            this.remarkModal = true;
+            //this.remarkModal = true;
+			this.$msg("即将开通...")
           }
         },
         {
           name: "重置密码",
           img: `${this.$constant.imgUrl}/retail/member/tab-icon-6.png`,
           funtion: () => {
-            this.passwordModal = true;
+            //this.passwordModal = true;
+			this.$msg("即将开通...")
           }
         }
       ],

hdApp/src/mixins/list.js

@@ -42,9 +42,7 @@ export default {
         this.list.finished = true
       }
       let listArr = res.data.list || res.data.data || res.data[listKey]
-      console.log(listArr,111)
-      this.list.data =
-        this.list.page === 1 ? listArr : this.list.data.concat(listArr)
+      this.list.data = this.list.page === 1 ? listArr : this.list.data.concat(listArr)
       this.list.total = res.data.totalPage * this.list.pageSize
       this.list.totalPage = res.data.totalPage || res.totalPage
       if (!res.data.moreData) {