shish 3 лет назад
Родитель
Сommit
d84962cddc
2 измененных файлов с 15 добавлено и 34 удалено
  1. 14 33
      hdApp/src/admin/goods/kind.vue
  2. 1 1
      hdApp/src/pagesPurchase/open.vue

+ 14 - 33
hdApp/src/admin/goods/kind.vue

@@ -8,10 +8,6 @@
 					</view>
 					<view class="list-det" @click="edit(item)">
 						<view class="app-size-28 app-color-0" style="font-size:35upx;">{{ item.name}}</view>
-						<view style="color:green;position:relative;">
-							<text v-if="item.status == 1" style="position:absolute;top:20upx;">启用</text>
-							<text v-else style="position:absolute;top:20upx;">停用</text>
-						</view>
 						<view class="list-operate">
 							<view class="operate-det">
 								<span @click.stop="delKind(item.id)">删除</span>
@@ -45,17 +41,14 @@
 							<input type="number" v-model="modifyForm.inTurn" @focus="modifyForm.inTurn=''" :adjust-position="false" class="inp-input" placeholder="值越大越靠前" />
 						</view>
 					</view>
-
 					<view class="inp-list-line">
 						<view class="line-label">属性</view>
 						<view class="line-input">
-
 							<radio-group @change="radioChange">
 								<label style="display:inline-block;font-size:30upx;" :for="item.flag" v-for="(item, index) in catItem" :key="index">
 									<radio :id="item.flag" :value="item.value" :checked="Number(item.value) == Number(flower)" :disabled="catDisabled" style="transform: scale(0.7,0.7);" />{{item.name}}
 								</label>
 							</radio-group>
-
 						</view>
 					</view>
 				</view>
@@ -69,7 +62,7 @@ import AppUploader from '@/components/app-uploader'
 import OperateModule from '@/admin/home/components/module/operate'
 import AppWrapperEmpty from '@/components/app-wrapper-empty'
 import { list } from '@/mixins'
-import { categoryStatusB, addKind, updateKind, categoryDelB } from '@/api/goods'
+import { addKind, updateKind } from '@/api/goods'
 import { getKindList } from '@/api/kind'
 export default {
 	name: 'kind',
@@ -97,7 +90,7 @@ export default {
 			catItem: [
 				{
                     value: 2,
-                    name: '选择',
+                    name: '选择',
 					flag:'notSel'
                 },
 				{
@@ -111,13 +104,10 @@ export default {
 					flag:'mater'
                 }
             ],
-			//0 绿植花瓶 1 鲜花商品
             flower:2,
 			catDisabled:false
 		}
 	},
-	computed: {
-	},
 	onPullDownRefresh() {
 		this.resetList()
 		this.getKindData().then(res => {
@@ -133,8 +123,6 @@ export default {
 			uni.stopPullDownRefresh()
 		}
 	},
-	onLoad() {
-	},
 	methods: {
 		radioChange(e){
 			this.flower = e.detail.value
@@ -160,9 +148,8 @@ export default {
 			this.getKindData()
 		},
 		getKindData() {
-			return getKindList().then(res => {
-				let data = { code: res.code, msg: res.msg, data: { list: res.data } }
-				this.completes(data)
+			return getKindList({page:this.list.page}).then(res => {
+				this.completes(res)
 			})
 		},
 		kindAddOrEdit() {
@@ -180,12 +167,14 @@ export default {
 				return false
 			}
 			host({ ...form,flower:this.flower }).then(res => {
-				this.$msg('操作成功!')
-				this.modalCancel()
-				setTimeout(() => {
-					this.resetList()
-					this.getKindData()
-				}, 1000)
+				if(res.code == 1){
+					this.$msg('操作成功!')
+					this.modalCancel()
+					setTimeout(() => {
+						this.resetList()
+						this.getKindData()
+					}, 1000)
+				}
 			})
 		},
 		modifyModalClick(e) {
@@ -199,16 +188,8 @@ export default {
 			this.delModal = false
 			this.modifyModal = false
 		},
-		delKind(id) {
-			uni.showModal({
-				title: '提示',
-				content: '确认删除?',
-				success: function (res) {
-					if (res.confirm) {
-						
-					}
-				}
-			})
+		delKind() {
+			this.$msg('开发中')
 		}
 	}
 }

+ 1 - 1
hdApp/src/pagesPurchase/open.vue

@@ -24,7 +24,7 @@ export default {
   methods: {
     changeCg(num){
       let that = this
-      let title = num == 0 ? '开' :'关闭' 
+      let title = num == 0 ? '开' :'关闭' 
       that.$util.confirmModal({content:'确认'+title+'?',okText:'确认'},() => {
         that.confirmRecover(num)
 			})