update

web-vue-admin/src/api/index.ts

@@ -66,6 +66,13 @@ export const getPaySelect = async(uid:any)=>{
     method:'post',
   });
 } 
+
+export const getPaySelect1 = async(uid:any)=>{
+  return  await request({
+    url: `/pay/findaliall?uid=${uid}`,
+    method:'post',
+  });
+} 
 export const onUpdate = async(data:any)=>{
   return  await request({
     url: `/pay/updateali`,

web-vue-admin/src/views/goods-cabinet/index.vue

@@ -232,7 +232,7 @@ const optionss = ref([])
 const previewTitle = ref("");
 const list = ref<any>([]);
 const value = ref<string>("");
-const status = ref<string>("0");
+const status = ref<string>("3");
 const previewImage = ref("");
 const previewVisible = ref(true);
 const modelRef = ref<any>({});
@@ -296,11 +296,11 @@ const onSearch = async (e:any) => {
   }
   const data:any = await onSelectGoods(prarms);
   list.value = data.data;
-  pagination.value.total =data.count
+  pagination.value.total =data.data.count
 
 };
 const tableChange=async(e:any)=>{
-  let queryData = {
+  let queryData:any = {
       current_page:e.current,//当前页数
       per_page:e.pageSize//每页显示条数
   };
@@ -312,7 +312,8 @@ const tableChange=async(e:any)=>{
     uid,
   }
   const data = await onSelectGoods(prarms);
-  list.value = data.data;
+  list.value = data.data.goods;
+  pagination.value.total =data.data.count
 }
 const onSearchName = async (e:any) => {
   const uid = getUid();
@@ -324,6 +325,7 @@ const onSearchName = async (e:any) => {
   };
   const data = await onFindbyLikeName(params);
   list.value = data.data.goods;
+    pagination.value.total =data.data.count
 };
 const onGoods = (e: any) => {
   propsData.isCad = e;
@@ -331,7 +333,18 @@ const onGoods = (e: any) => {
 };
 const onBack = async (e: Number) => {
   isShowGoods.value = !isShowGoods.value;
-  // await onSearch({target:{value:'3'}})
+
+  const uid = getUid();
+  const prarms: any = {
+    size: 10,
+    page: 1,
+    strtus: '3',
+    uid,
+  }
+  const data:any = await onSelectGoods(prarms);
+  list.value = data.data.goods;
+  pagination.value.total =data.data.count
+
 };
 const onEdit = (e: any) => {
   visible.value = !visible.value;
@@ -388,7 +401,7 @@ const init = async () => {
   }
   const data:any = await onSelectGoods(prarms);
   list.value = data.data.goods;
-  pagination.value.total =data.count
+  pagination.value.total =data.data.count
 
 };
 const textChange = (e: any) => {

web-vue-admin/src/views/home/index.vue

@@ -35,10 +35,10 @@
               @click="goNewPage(item,index)"
             >
               <div style="display: flex; align-items: center" >
-                <img v-if="index === 0" src="../../assets/img/1.png" alt=""  style="width:30px;height: 30px; padding: 5px;"/>
-                <img v-else-if="index === 1" src="../../assets/img/2.png" alt="" style="width:30px;height: 30px; padding: 5px;" />
-                <img  v-else-if="index === 2" src="../../assets/img/3.png" alt="" style="width:30px;height: 30px; padding: 5px;" />
-                <img v-else-if="index === 3" src="../../assets/img/1.png" alt="" style="width:30px;height: 30px;padding: 5px;"  />
+                <img v-if="index === 0" :src="indexItem !== index?one:five" alt=""  style="width:30px;height: 30px; padding: 5px;"/>
+                <img v-else-if="index === 1" :src="indexItem !== index?two:six" alt="" style="width:30px;height: 30px; padding: 5px;" />
+                <img  v-else-if="index === 2" :src="indexItem !== index?three:seven" alt="" style="width:30px;height: 30px; padding: 5px;" />
+                <img v-else-if="index === 3" :src="indexItem !== index?four:eight" alt="" style="width:30px;height: 30px;padding: 5px;"  />
                 <span class="nav-text" >{{ item.name }}</span>
               </div>
             </a-menu-item>
@@ -69,7 +69,14 @@ import {
   DashOutlined,
 } from "@ant-design/icons-vue";
 import type { MenuProps } from 'ant-design-vue';
-import { getRouters } from "@/api/index";
+import one from '@/assets/img/1.png'
+import two from '@/assets/img/2.png'
+import three from '@/assets/img/3.png'
+import four from '@/assets/img/4.png'
+import five from '@/assets/img/5.png'
+import six from '@/assets/img/6.png'
+import seven from '@/assets/img/7.png'
+import eight from '@/assets/img/8.png'
 interface FormUser {
   name: String;
   password: String;
@@ -77,7 +84,7 @@ interface FormUser {
 
 const router = useRouter();
 const store = useStore();
-const indexItem = ref<any>(0)
+const indexItem = ref<any>('0')
 const selectedKeys = ref<string[]>(["1"])
 const list = ref<any>()
 const info = reactive<FormUser>(store.getters.getUserInfo);
@@ -150,6 +157,7 @@ defineExpose({
   openKeys: ref<string[]>(["sub1"]),
   goNewPage,
   handleMenuClick,
+  one,
   info,
   store,
 });

web-vue-admin/src/views/pay-config/compoents/body/index.vue

@@ -50,8 +50,8 @@ const onSubmit = () => {
         appid:toRaw(modelRef).appid,
         secret:toRaw(modelRef).secret,
       }
-
-      if (uid) {
+  
+      if (id.value > '0') {
         const data: any = await onUpdaterealmName(JSON.stringify(params))
         if (data.state === 1) {
           message.success('更新成功');
@@ -64,8 +64,6 @@ const onSubmit = () => {
           onSreach(uid)
         }
       }
-
-
     })
     .catch((err) => {
       console.log("error", err);
@@ -73,14 +71,20 @@ const onSubmit = () => {
 };
 const onSreach = async (uid: any) => {
   const data = await onSearchSelectrealmName(uid)
-  modelRef.alName = data.data[0].url
-  modelRef.appid = data.data[0].appid
-   modelRef.secret = data.data[0].secret
-  localStorage.setItem('url',modelRef.alName)
+  console.log(data,'data');
+  if(data.data.length > 0) {
+     modelRef.alName = data.data[0].url
+      modelRef.appid = data.data[0].appid
+      modelRef.secret = data.data[0].secret
+      localStorage.setItem('url',modelRef.alName)
+      id.value = data.data[0].id
+  }
+ 
+  
   if (!data.data[0].userid) {
     uid.value = true
   }
-  id.value = data.data[0].id
+  
 }
 onMounted(async () => {
   const uid = getUid()

web-vue-admin/src/views/pay-list/components/createpay/index.vue

@@ -6,7 +6,7 @@
             <a-form-item label="选择商品" name="subject" :rules="rulesRef.subject" :label-col="{ span: 2 }"
                 labelAlign="left">
                 <div style="width:100%;display: flex;align-items: center;">
-                  <a-select v-model:value="formState.subject" :default-active-first-option="false" mode="multiple" style="width: 100%" placeholder="请选择商品"  @search="onSubSearch"  @change="onSubSearch"   @select="onSelectss" @popupScroll="popupScroll">
+                  <a-select v-model:value="formState.subject" :default-active-first-option="false" mode="multiple" style="width: 100%" placeholder="请选择商品" @focus="onSubSearch"  @search="onSubSearch"  @change="onSubSearch"   @select="onSelect" @popupScroll="popupScroll">
                        <a-select-option   v-for="(item,index) in optionss.list" :itemKey="item" :value="item.subject" :label="index" :key="index" >
                             {{item.subject}}
                         </a-select-option>
@@ -59,12 +59,12 @@
                 <a-date-picker v-model:value="formState.starttime" :locale="locale" :format="dateFormat"  :disabledDate="disabledDate"/> <a-time-picker style="margin-left:10px;" v-model:value="startvalue"  format="HH:mm" />
                 </div>
             </a-form-item> -->
-            <!-- <a-form-item label="结束时间" name="price"  :label-col="{ span: 2 }"
+            <a-form-item label="结束时间" name="price"  :label-col="{ span: 2 }"
                 labelAlign="left">
                 <div style="display:flex">
                 <a-date-picker v-model:value="formState.expireendtime" :locale="locale" :format="dateFormat"    :disabledDate="disabledDate"/>  <a-time-picker style="margin-left:10px;" v-model:value="endvalue"  format="HH:mm" />
                 </div>
-            </a-form-item> -->
+            </a-form-item>
             <a-form-item label="信息备注" name="price"  :label-col="{ span: 2 }"
                 labelAlign="left">
                 <div style="display:flex">
@@ -170,6 +170,8 @@ const rulesRef = reactive({
 });
 const {  validate } = useForm(formState, rulesRef);
 const onSelect = (value: any, option: any) => {
+    console.log(option.itemKey.price,'option.itemKey.price');
+    
     price.value = option.itemKey.price/100
 }
 const onSubmit = () => {
@@ -229,13 +231,13 @@ const popupScroll = ()=>{
 }
 const onSubSearch = async(value:any)=>{
     optionss.list=[]
-  const uid = getUid();
-    const params = {
-        name: value.target?'':value,
-        page:1,
-        size:10,
-        uid,
-    };
+    const uid = getUid();
+        const params = {
+            name: value.target?'':value,
+            page:1,
+            size:10,
+            uid,
+   };
     const data = await onFindbyLikeName(params);
     optionss.list= data.data.goods
     

web-vue-admin/src/views/pay-list/index.vue

@@ -76,7 +76,7 @@
                     <a-radio-group v-model:value="formState.paymentmodel" name="radioGroup" class="pay">
                         <div style="display: flex;height: 35px;">
                             <a-radio value="0" style="width:150px;">商品默认金额</a-radio>
-                            <a-input-number style="width:200px;height: 35px;" :value="formState.markingprice"  :formatter="value => `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')"
+                            <a-input-number style="width:200px;height: 35px;" :value="formState.price"  :formatter="value => `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')"
                                 :parser="value => value.replace(/\$\s?|(,*)/g, '')" :disabled="true"/>
                             <div style="width:50px;">元</div>
                         </div>
@@ -203,7 +203,8 @@ const handleOk =async(e: MouseEvent) => {
     const uid =getUid()
     const starttime  =  moment(new Date()).format('YYYY-MM-DDTHH:mm:[00][Z]')
     const expireendtime  = (moment(value4.value.$d).format('YYYY-MM-DD'))+(moment(value5.value.$d).format('THH:mm:[00][Z]'))
-     formState.value.fullphone = formState.value.fullphone?'1':'0'
+    formState.value.fullphone = formState.value.fullphone?'1':'0'
+    formState.value.payment=  formState.value.payment*100
     const params={
         ...formState.value,
         uid,
@@ -305,7 +306,7 @@ const onSelect =(e:any,opt:any)=>{
         ...opt.itemKey,
         id
     }
-    formState.value.markingprice = formState.value.markingprice/100
+    formState.value.price = formState.value.price/100
     formState.value.paymentmodel= '0'
     
 }
@@ -319,6 +320,7 @@ const onSubSearch = async(value:any)=>{
     };
     const data = await onFindbyLikeName(params);
     listArray.value = data.data.goods
+    pagination.value.total =data.data.count
 }
 const popupScroll = ()=>{
     console.log(1);